summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mv78xx0
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2016-02-08 13:53:27 -0800
committerOlof Johansson <olof@lixom.net>2016-02-08 13:53:27 -0800
commit915c7ce8ad9a7b2ea6f1e91d9a52ce605578e8bf (patch)
tree6d46386814fbba34ec487ada0b04880fc8535d88 /arch/arm/mach-mv78xx0
parent8527cfce6e15bc6764d13fd28dd2d836345cb89d (diff)
parent727c62d29c3a0b982fb72ef993db95e9d2036e07 (diff)
downloadlinux-915c7ce8ad9a7b2ea6f1e91d9a52ce605578e8bf.tar.bz2
Merge tag 'mvebu-cleanup-4.6-1' of git://git.infradead.org/linux-mvebu into next/cleanup
mvebu cleanup for 4.6 (part 1) use "depends on" instead of "if" after prompt for mv78xx0 * tag 'mvebu-cleanup-4.6-1' of git://git.infradead.org/linux-mvebu: ARM: mv78xx0: use "depends on" instead of "if" after prompt Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-mv78xx0')
-rw-r--r--arch/arm/mach-mv78xx0/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-mv78xx0/Kconfig b/arch/arm/mach-mv78xx0/Kconfig
index a32575fa3fba..c32f85559c65 100644
--- a/arch/arm/mach-mv78xx0/Kconfig
+++ b/arch/arm/mach-mv78xx0/Kconfig
@@ -1,5 +1,6 @@
menuconfig ARCH_MV78XX0
- bool "Marvell MV78xx0" if ARCH_MULTI_V5
+ bool "Marvell MV78xx0"
+ depends on ARCH_MULTI_V5
select ARCH_REQUIRE_GPIOLIB
select CPU_FEROCEON
select MVEBU_MBUS