diff options
author | Olof Johansson <olof@lixom.net> | 2016-01-12 10:14:07 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2016-01-12 10:14:07 -0800 |
commit | 3e9121950c92a65e33e0163d2ba111b4d9293d4c (patch) | |
tree | 478a948e76d8f660b0f3b898c1094df5b172e433 /arch/arm/mach-tegra/Kconfig | |
parent | 31ade3b83e1821da5fbb2f11b5b3d4ab2ec39db8 (diff) | |
parent | e324654294907a420ab3773efe8849a935f37bf0 (diff) |
Merge branch 'treewide/cleanup' into late/tegra
* 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-tegra/Kconfig')
-rw-r--r-- | arch/arm/mach-tegra/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig index 0fa4c5f8b1be..a90f3556017f 100644 --- a/arch/arm/mach-tegra/Kconfig +++ b/arch/arm/mach-tegra/Kconfig @@ -1,5 +1,6 @@ menuconfig ARCH_TEGRA - bool "NVIDIA Tegra" if ARCH_MULTI_V7 + bool "NVIDIA Tegra" + depends on ARCH_MULTI_V7 select ARCH_REQUIRE_GPIOLIB select ARCH_SUPPORTS_TRUSTED_FOUNDATIONS select ARM_AMBA |