Merge branch 'stable/bug-fixes-rc2' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / arch / ia64 / Kconfig

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index fcf3b43..e5cc56a 100644 (file)
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -26,6 +26,7 @@ config IA64
        select GENERIC_IRQ_PROBE
        select GENERIC_PENDING_IRQ if SMP
        select IRQ_PER_CPU
+       select GENERIC_IRQ_SHOW
        default y
        help
          The Itanium Processor Family is Intel's 64-bit successor to
@@ -413,11 +414,11 @@ config PERMIT_BSP_REMOVE
        support. 
 
 config FORCE_CPEI_RETARGET
-       bool "Force assumption that CPEI can be re-targetted"
+       bool "Force assumption that CPEI can be re-targeted"
        depends on PERMIT_BSP_REMOVE
        default n
        ---help---
-       Say Y if you need to force the assumption that CPEI can be re-targetted to
+       Say Y if you need to force the assumption that CPEI can be re-targeted to
        any cpu in the system. This hint is available via ACPI 3.0 specifications.
        Tiger4 systems are capable of re-directing CPEI to any CPU other than BSP.
        This option it useful to enable this feature on older BIOS's as well.