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

[karo-tx-linux.git] / arch / powerpc / platforms / Kconfig

diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index 0cfb46d54b8c922db3b4136b1f7eb021213c48e7..a35ca44ade66a455c0cf5b13d0f1ccd204a3b671 100644 (file)
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -2,7 +2,6 @@ menu "Platform support"
 
 source "arch/powerpc/platforms/powernv/Kconfig"
 source "arch/powerpc/platforms/pseries/Kconfig"
-source "arch/powerpc/platforms/iseries/Kconfig"
 source "arch/powerpc/platforms/chrp/Kconfig"
 source "arch/powerpc/platforms/512x/Kconfig"
 source "arch/powerpc/platforms/52xx/Kconfig"
@@ -87,6 +86,14 @@ config MPIC_WEIRD
        bool
        default n
 
+config MPIC_MSGR
+       bool "MPIC message register support"
+       depends on MPIC
+       default n
+       help
+         Enables support for the MPIC message registers.  These
+         registers are used for inter-processor communication.
+
 config PPC_I8259
        bool
        default n
@@ -138,7 +145,7 @@ config MPIC_BROKEN_REGREAD
          of the register contents in software.
 
 config IBMVIO
-       depends on PPC_PSERIES || PPC_ISERIES
+       depends on PPC_PSERIES
        bool
        default y