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

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

diff --git a/arch/powerpc/platforms/83xx/Kconfig b/arch/powerpc/platforms/83xx/Kconfig
index fe75b2a..6159c5d 100644 (file)
--- a/arch/powerpc/platforms/83xx/Kconfig
+++ b/arch/powerpc/platforms/83xx/Kconfig
@@ -1,10 +1,13 @@
-menuconfig MPC83xx
-       bool "83xx Board Type"
-       depends on PPC_83xx
+menuconfig PPC_83xx
+       bool "83xx-based boards"
+       depends on 6xx && PPC_MULTIPLATFORM
        select PPC_UDBG_16550
-       select PPC_INDIRECT_PCI
+       select PPC_PCI_CHOICE
+       select FSL_PCI if PCI
+       select FSL_SOC
+       select IPIC
 
-if MPC83xx
+if PPC_83xx
 
 config MPC831x_RDB
        bool "Freescale MPC831x RDB"