2 files changed, 5 insertions, 16 deletions

diff --git a/arch/powerpc/platforms/86xx/Kconfig b/arch/powerpc/platforms/86xx/Kconfig
index 0c70944d0e37..d1bcff500464 100644
--- a/arch/powerpc/platforms/86xx/Kconfig
+++ b/arch/powerpc/platforms/86xx/Kconfig
@@ -1,8 +1,6 @@
-menu "Platform Support"
-        depends on PPC_86xx
-
 choice
         prompt "Machine Type"
+        depends on PPC_86xx
         default MPC8641_HPCN
 
 config MPC8641_HPCN
@@ -14,20 +12,10 @@ config MPC8641_HPCN
 
 endchoice
 
-
 config MPC8641
         bool
         select PPC_INDIRECT_PCI
+        select PPC_INDIRECT_PCI_BE
         select PPC_UDBG_16550
+        select MPIC
         default y if MPC8641_HPCN
-
-config MPIC
-        bool
-        default y
-
-config PPC_INDIRECT_PCI_BE
-        bool
-        depends on PPC_86xx
-        default y
-
-endmenu
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index 176a27ff8f68..5f2cef071919 100644
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -1,5 +1,5 @@
 menu "Platform support"
-        depends on PPC64 || CLASSIC32
+        depends on PPC64 || CLASSIC32 || PPC_86xx
 
 choice
         prompt "Machine type"
@@ -45,6 +45,7 @@ source "arch/powerpc/platforms/pasemi/Kconfig"
 source arch/powerpc/platforms/celleb/Kconfig
 source arch/powerpc/platforms/ps3/Kconfig
 source arch/powerpc/platforms/cell/Kconfig
+source "arch/powerpc/platforms/86xx/Kconfig"
 
 config PPC_NATIVE
         bool