Merge tag 'bcm2835-soc-next-2015-12-28' of http://github.com/anholt/linux into next/soc

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

diff --git a/arch/arm/mach-u300/Kconfig b/arch/arm/mach-u300/Kconfig
index bc51a71394af722a5ba577863cdc28d87d0d61a3..301a98498453d40915c2292da3d844d38bcce3e5 100644 (file)
--- a/arch/arm/mach-u300/Kconfig
+++ b/arch/arm/mach-u300/Kconfig
@@ -1,6 +1,6 @@
 menuconfig ARCH_U300
-       bool "ST-Ericsson U300 Series" if ARCH_MULTI_V5
-       depends on MMU
+       bool "ST-Ericsson U300 Series"
+       depends on ARCH_MULTI_V5 && MMU
        select ARCH_REQUIRE_GPIOLIB
        select ARM_AMBA
        select ARM_VIC