3 files changed, 6 insertions, 27 deletions

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 89e9c859eccb..033666cf0f77 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -377,7 +377,6 @@ source "arch/powerpc/platforms/Kconfig"
 
 source arch/powerpc/platforms/embedded6xx/Kconfig
 source arch/powerpc/platforms/4xx/Kconfig
-source arch/powerpc/platforms/85xx/Kconfig
 
 menu "Kernel options"
 
diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig
index 124e2c595972..c79ae86c49c5 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,33 +44,14 @@ 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
         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
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index eb69e72ce620..e173fd49b0ff 100644
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -1,6 +1,6 @@
 menu "Platform support"
         depends on PPC64 || CLASSIC32 || PPC_8xx || PPC_82xx || PPC_83xx || \
-                        PPC_86xx
+                        PPC_85xx || PPC_86xx
 
 choice
         prompt "Machine type"
@@ -49,6 +49,7 @@ source arch/powerpc/platforms/cell/Kconfig
 source "arch/powerpc/platforms/8xx/Kconfig"
 source "arch/powerpc/platforms/82xx/Kconfig"
 source "arch/powerpc/platforms/83xx/Kconfig"
+source "arch/powerpc/platforms/85xx/Kconfig"
 source "arch/powerpc/platforms/86xx/Kconfig"
 
 config PPC_NATIVE