Merge branches 'dt/next' and 'dt/linus' into for-next

[karo-tx-linux.git] / arch / arm / mach-mv78xx0 / Kconfig

diff --git a/arch/arm/mach-mv78xx0/Kconfig b/arch/arm/mach-mv78xx0/Kconfig
index f2d309d0619ea9ff06e21ad4e1d200a264dba246..a32575fa3fba4d727e4584e7c169a5de09f46c48 100644 (file)
--- a/arch/arm/mach-mv78xx0/Kconfig
+++ b/arch/arm/mach-mv78xx0/Kconfig
@@ -1,6 +1,15 @@
-if ARCH_MV78XX0
+menuconfig ARCH_MV78XX0
+       bool "Marvell MV78xx0" if ARCH_MULTI_V5
+       select ARCH_REQUIRE_GPIOLIB
+       select CPU_FEROCEON
+       select MVEBU_MBUS
+       select PCI
+       select PLAT_ORION_LEGACY
+       help
+         Support for the following Marvell MV78xx0 series SoCs:
+         MV781x0, MV782x0.
 
-menu "Marvell MV78xx0 Implementations"
+if ARCH_MV78XX0
 
 config MACH_DB78X00_BP
        bool "Marvell DB-78x00-BP Development Board"
@@ -20,6 +29,4 @@ config MACH_TERASTATION_WXL
          Say 'Y' here if you want your kernel to support the
          Buffalo WXL Nas.
 
-endmenu
-
 endif