Merge tag 'tegra-for-4.5-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra...

[deliverable/linux.git] / arch / arm / mach-mvebu / Kconfig

diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
index e20fc4178b15b029f098690f0bc9420be170c141..64e3d2ce9a076650b7eb3056cd4194419ae7d3dd 100644 (file)
--- a/arch/arm/mach-mvebu/Kconfig
+++ b/arch/arm/mach-mvebu/Kconfig
@@ -1,5 +1,6 @@
 menuconfig ARCH_MVEBU
-       bool "Marvell Engineering Business Unit (MVEBU) SoCs" if (ARCH_MULTI_V7 || ARCH_MULTI_V5)
+       bool "Marvell Engineering Business Unit (MVEBU) SoCs"
+       depends on ARCH_MULTI_V7 || ARCH_MULTI_V5
        select ARCH_SUPPORTS_BIG_ENDIAN
        select CLKSRC_MMIO
        select GENERIC_IRQ_CHIP
@@ -25,7 +26,8 @@ config MACH_MVEBU_V7
        select MACH_MVEBU_ANY
 
 config MACH_ARMADA_370
-       bool "Marvell Armada 370 boards" if ARCH_MULTI_V7
+       bool "Marvell Armada 370 boards"
+       depends on ARCH_MULTI_V7
        select ARMADA_370_CLK
        select CPU_PJ4B
        select MACH_MVEBU_V7
@@ -35,7 +37,8 @@ config MACH_ARMADA_370
          on the Marvell Armada 370 SoC with device tree.
 
 config MACH_ARMADA_375
-       bool "Marvell Armada 375 boards" if ARCH_MULTI_V7
+       bool "Marvell Armada 375 boards"
+       depends on ARCH_MULTI_V7
        select ARM_ERRATA_720789
        select ARM_ERRATA_753970
        select ARM_GIC
@@ -50,7 +53,8 @@ config MACH_ARMADA_375
          on the Marvell Armada 375 SoC with device tree.
 
 config MACH_ARMADA_38X
-       bool "Marvell Armada 380/385 boards" if ARCH_MULTI_V7
+       bool "Marvell Armada 380/385 boards"
+       depends on ARCH_MULTI_V7
        select ARM_ERRATA_720789
        select ARM_ERRATA_753970
        select ARM_GIC
@@ -65,7 +69,8 @@ config MACH_ARMADA_38X
          on the Marvell Armada 380/385 SoC with device tree.
 
 config MACH_ARMADA_39X
-       bool "Marvell Armada 39x boards" if ARCH_MULTI_V7
+       bool "Marvell Armada 39x boards"
+       depends on ARCH_MULTI_V7
        select ARM_GIC
        select ARMADA_39X_CLK
        select CACHE_L2X0
@@ -79,7 +84,8 @@ config MACH_ARMADA_39X
          on the Marvell Armada 39x SoC with device tree.
 
 config MACH_ARMADA_XP
-       bool "Marvell Armada XP boards" if ARCH_MULTI_V7
+       bool "Marvell Armada XP boards"
+       depends on ARCH_MULTI_V7
        select ARMADA_XP_CLK
        select CPU_PJ4B
        select MACH_MVEBU_V7
@@ -89,7 +95,8 @@ config MACH_ARMADA_XP
          on the Marvell Armada XP SoC with device tree.
 
 config MACH_DOVE
-       bool "Marvell Dove boards" if ARCH_MULTI_V7
+       bool "Marvell Dove boards"
+       depends on ARCH_MULTI_V7
        select CACHE_L2X0
        select CPU_PJ4
        select DOVE_CLK
@@ -103,7 +110,8 @@ config MACH_DOVE
          Marvell Dove using flattened device tree.
 
 config MACH_KIRKWOOD
-       bool "Marvell Kirkwood boards" if ARCH_MULTI_V5
+       bool "Marvell Kirkwood boards"
+       depends on ARCH_MULTI_V5
        select ARCH_REQUIRE_GPIOLIB
        select CPU_FEROCEON
        select KIRKWOOD_CLK