Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh...

[linux-2.6-omap-h63xx.git] / arch / ia64 / Kconfig

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index e19185d2655484b1f4f8131025ba8ed497a99050..db9ddff958416bd8e189cb0006f60a5fd9cbe4ce 100644 (file)
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -14,6 +14,7 @@ config IA64
        select PCI if (!IA64_HP_SIM)
        select ACPI if (!IA64_HP_SIM)
        select PM if (!IA64_HP_SIM)
+       select ARCH_SUPPORTS_MSI
        default y
        help
          The Itanium Processor Family is Intel's 64-bit successor to
@@ -30,6 +31,10 @@ config ZONE_DMA
        def_bool y
        depends on !IA64_SGI_SN2
 
+config QUICKLIST
+       bool
+       default y
+
 config MMU
        bool
        default y
@@ -438,6 +443,16 @@ config IA64_PALINFO
          To use this option, you have to ensure that the "/proc file system
          support" (CONFIG_PROC_FS) is enabled, too.
 
+config IA64_MC_ERR_INJECT
+       tristate "MC error injection support"
+       help
+         Selets whether support for MC error injection. By enabling the
+         support, kernel provide sysfs interface for user application to
+         call MC error injection PAL procedure to inject various errors.
+         This is a useful tool for MCA testing.
+
+         If you're unsure, do not select this option.
+
 config SGI_SN
        def_bool y if (IA64_SGI_SN2 || IA64_GENERIC)
 
@@ -457,7 +472,7 @@ config KEXEC
        help
          kexec is a system call that implements the ability to shutdown your
          current kernel, and to start another kernel.  It is like a reboot
-         but it is indepedent of the system firmware.   And like a reboot
+         but it is independent of the system firmware.   And like a reboot
          you can start any kernel with it, not just Linux.
 
          The name comes from the similiarity to the exec system call.
@@ -505,8 +520,10 @@ config PCI
          here unless you are using a simulator without PCI support.
 
 config PCI_DOMAINS
-       bool
-       default PCI
+       def_bool PCI
+
+config PCI_SYSCALL
+       def_bool PCI
 
 source "drivers/pci/pcie/Kconfig"