Merge git://git.linux-nfs.org/pub/linux/nfs-2.6

[sfrench/cifs-2.6.git] / arch / ia64 / Kconfig

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index d51f0f11f7f95169f424cd99768928635be92dd3..6e41471449c034f0cd32265590608fcfe68b604c 100644 (file)
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -13,6 +13,8 @@ config IA64
        bool
        select PCI if (!IA64_HP_SIM)
        select ACPI if (!IA64_HP_SIM)
        bool
        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
        default y
        help
          The Itanium Processor Family is Intel's 64-bit successor to


@@ -437,6 +439,16 @@ config IA64_PALINFO
          To use this option, you have to ensure that the "/proc file system
          support" (CONFIG_PROC_FS) is enabled, too.
 
          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)
 
 config SGI_SN
        def_bool y if (IA64_SGI_SN2 || IA64_GENERIC)
 


@@ -456,7 +468,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
        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.
          you can start any kernel with it, not just Linux.
 
          The name comes from the similiarity to the exec system call.