powerpc/kconfig: Kill PPC_MULTIPLATFORM

[deliverable/linux.git] / arch / powerpc / platforms / 86xx / Kconfig

diff --git a/arch/powerpc/platforms/86xx/Kconfig b/arch/powerpc/platforms/86xx/Kconfig
index 77dd797a2580e73f90dce98b08a20d1ed5313b75..3492784507365856aa0cb8054f0bd271dcbe9f1a 100644 (file)
--- a/arch/powerpc/platforms/86xx/Kconfig
+++ b/arch/powerpc/platforms/86xx/Kconfig
@@ -1,7 +1,7 @@
 config PPC_86xx
 menuconfig PPC_86xx
        bool "86xx-based boards"
-       depends on 6xx && PPC_MULTIPLATFORM
+       depends on 6xx
        select FSL_SOC
        select ALTIVEC
        help
@@ -31,9 +31,19 @@ config MPC8610_HPCD
        help
          This option enables support for the MPC8610 HPCD board.
 
+config GEF_SBC310
+       bool "GE Fanuc SBC310"
+       select DEFAULT_UIMAGE
+       select GENERIC_GPIO
+       select ARCH_REQUIRE_GPIOLIB
+       help
+         This option enables support for GE Fanuc's SBC310.
+
 config GEF_SBC610
        bool "GE Fanuc SBC610"
        select DEFAULT_UIMAGE
+       select GENERIC_GPIO
+       select ARCH_REQUIRE_GPIOLIB
        select HAS_RAPIDIO
        help
          This option enables support for GE Fanuc's SBC610.
@@ -46,7 +56,7 @@ config MPC8641
        select FSL_PCI if PCI
        select PPC_UDBG_16550
        select MPIC
-       default y if MPC8641_HPCN || SBC8641D || GEF_SBC610
+       default y if MPC8641_HPCN || SBC8641D || GEF_SBC610 || GEF_SBC310
 
 config MPC8610
        bool