Merge branch 'kconfig' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into for-2.6.22

1 files changed, 4 insertions, 25 deletions

diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig
index 329fcd48669a..629926e01e90 100644
--- a/arch/powerpc/platforms/85xx/Kconfig
+++ b/arch/powerpc/platforms/85xx/Kconfig
@@ -1,8 +1,6 @@
-menu "Platform support"
-        depends on PPC_85xx
-
 choice
         prompt "Machine Type"
+        depends on PPC_85xx
         default MPC8540_ADS
 
 config MPC8540_ADS
@@ -46,34 +44,15 @@ config MPC8540
 
 config MPC8560
         bool
-        select PPC_INDIRECT_PCI
+        select CPM2
         default y if MPC8560_ADS
 
 config MPC85xx
         bool
         select PPC_UDBG_16550
         select PPC_INDIRECT_PCI
+        select PPC_INDIRECT_PCI_BE
+        select MPIC
         select SERIAL_8250_SHARE_IRQ if SERIAL_8250
         default y if MPC8540_ADS || MPC85xx_CDS || MPC8560_ADS \
                 || MPC85xx_MDS || MPC8544_DS
-
-config PPC_INDIRECT_PCI_BE
-        bool
-        depends on PPC_85xx
-        default y
-
-config MPIC
-        bool
-        default y
-
-config CPM2
-        bool
-        depends on MPC8560
-        default y
-        help
-          The CPM2 (Communications Processor Module) is a coprocessor on
-          embedded CPUs made by Motorola.  Selecting this option means that
-          you wish to build a kernel for a machine with a CPM2 coprocessor
-          on it.
-
-endmenu