diff options
author | Olof Johansson <olof@lixom.net> | 2015-12-22 13:10:00 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2015-12-22 13:10:00 -0800 |
commit | 8907dbaa363de87e5c6f48070e3d8b639477d5ba (patch) | |
tree | 8c3e0245a7bd10535e5fab6d2da99de6824f5851 /arch/arm/mach-shmobile/Kconfig | |
parent | 9cdac4a20a963d946f3ce13e6dd4943a780f5b54 (diff) | |
parent | e324654294907a420ab3773efe8849a935f37bf0 (diff) | |
download | linux-8907dbaa363de87e5c6f48070e3d8b639477d5ba.tar.bz2 |
Merge branch 'treewide/cleanup' into next/soc
Merge in cleanup to avoid internal conflicts with newly added code.
* treewide/cleanup:
ARM: use "depends on" for SoC configs instead of "if" after prompt
ARM/clocksource: use automatic DT probing for ux500 PRCMU
ARM: use const and __initconst for smp_operations
ARM: hisi: do not export smp_operations structures
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-shmobile/Kconfig')
-rw-r--r-- | arch/arm/mach-shmobile/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index 88734a5e10ca..0f25f8fa2692 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig @@ -30,8 +30,8 @@ config ARCH_RMOBILE select SYS_SUPPORTS_SH_TMU menuconfig ARCH_SHMOBILE_MULTI - bool "Renesas ARM SoCs" if ARCH_MULTI_V7 - depends on MMU + bool "Renesas ARM SoCs" + depends on ARCH_MULTI_V7 && MMU select ARCH_SHMOBILE select HAVE_ARM_SCU if SMP select HAVE_ARM_TWD if SMP |