Merge branch 'exec_rm_compat' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg...

[pandora-kernel.git] / arch / powerpc / platforms / Kconfig

diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index f7b0772..f970ca2 100644 (file)
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -20,6 +20,7 @@ source "arch/powerpc/platforms/embedded6xx/Kconfig"
 source "arch/powerpc/platforms/44x/Kconfig"
 source "arch/powerpc/platforms/40x/Kconfig"
 source "arch/powerpc/platforms/amigaone/Kconfig"
+source "arch/powerpc/platforms/wsp/Kconfig"
 
 config KVM_GUEST
        bool "KVM Guest support"
@@ -56,16 +57,19 @@ config UDBG_RTAS_CONSOLE
        depends on PPC_RTAS
        default n
 
+config PPC_SMP_MUXED_IPI
+       bool
+       help
+         Select this opton if your platform supports SMP and your
+         interrupt controller provides less than 4 interrupts to each
+         cpu.  This will enable the generic code to multiplex the 4
+         messages on to one ipi.
+
 config PPC_UDBG_BEAT
        bool "BEAT based debug console"
        depends on PPC_CELLEB
        default n
 
-config XICS
-       depends on PPC_PSERIES
-       bool
-       default y
-
 config IPIC
        bool
        default n
@@ -147,14 +151,27 @@ config PPC_970_NAP
        bool
        default n
 
+config PPC_P7_NAP
+       bool
+       default n
+
 config PPC_INDIRECT_IO
        bool
        select GENERIC_IOMAP
-       default n
+
+config PPC_INDIRECT_PIO
+       bool
+       select PPC_INDIRECT_IO
+
+config PPC_INDIRECT_MMIO
+       bool
+       select PPC_INDIRECT_IO
+
+config PPC_IO_WORKAROUNDS
+       bool
 
 config GENERIC_IOMAP
        bool
-       default n
 
 source "drivers/cpufreq/Kconfig"