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

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

diff --git a/arch/powerpc/platforms/82xx/Kconfig b/arch/powerpc/platforms/82xx/Kconfig
index 4fad6c7..75eb1ed 100644 (file)
--- a/arch/powerpc/platforms/82xx/Kconfig
+++ b/arch/powerpc/platforms/82xx/Kconfig
@@ -1,7 +1,8 @@
-choice
-       prompt "82xx Board Type"
-       depends on PPC_82xx
-       default MPC8272_ADS
+menuconfig PPC_82xx
+       bool "82xx-based boards (PQ II)"
+       depends on 6xx && PPC_MULTIPLATFORM
+
+if PPC_82xx
 
 config MPC8272_ADS
        bool "Freescale MPC8272 ADS"
@@ -11,7 +12,6 @@ config MPC8272_ADS
        select 8260
        select FSL_SOC
        select PQ2_ADS_PCI_PIC if PCI
-       select PPC_CPM_NEW_BINDING
        help
          This option enables support for the MPC8272 ADS board
 
@@ -22,7 +22,6 @@ config PQ2FADS
        select 8260
        select FSL_SOC
        select PQ2_ADS_PCI_PIC if PCI
-       select PPC_CPM_NEW_BINDING
        help
          This option enables support for the PQ2FADS board
 
@@ -31,7 +30,7 @@ config EP8248E
        select 8272
        select 8260
        select FSL_SOC
-       select PPC_CPM_NEW_BINDING
+       select PHYLIB
        select MDIO_BITBANG
        help
          This enables support for the Embedded Planet EP8248E board.
@@ -39,7 +38,7 @@ config EP8248E
          This board is also resold by Freescale as the QUICCStart
          MPC8248 Evaluation System and/or the CWH-PPC-8248N-VE.
 
-endchoice
+endif
 
 config PQ2ADS
        bool