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

diff --cc arch/powerpc/platforms/85xx/Kconfig
index 329fcd4,c79ae86..629926e
--- 1/arch/powerpc/platforms/85xx/Kconfig
--- 2/arch/powerpc/platforms/85xx/Kconfig
+++ b/arch/powerpc/platforms/85xx/Kconfig
@@@ -53,27 -51,7 +51,8 @@@ config MPC85x
        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