diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-12-18 17:07:52 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-12-18 17:07:52 +0100 |
| commit | 11c7a6c5a3232e2ff1127d80d609daa95df5d5d4 (patch) | |
| tree | 52a7bfe7994eb7f0c9d4b9301ad3c27f9bb9ad71 /arch/arm/mach-integrator | |
| parent | 3f93c644c92db1abb6149da712713132e0b37cfc (diff) | |
| parent | e324654294907a420ab3773efe8849a935f37bf0 (diff) | |
| download | linux-11c7a6c5a3232e2ff1127d80d609daa95df5d5d4.tar.bz2 | |
Merge branch 'treewide/cleanup' into next/multiplatform
The realview multiplatform series has a trivial conflict with
one of the treewide cleanups, let's just merge that in to
avoid having to resolve this later.
* 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
Conflicts:
arch/arm/mach-integrator/Kconfig
Diffstat (limited to 'arch/arm/mach-integrator')
| -rw-r--r-- | arch/arm/mach-integrator/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-integrator/Kconfig b/arch/arm/mach-integrator/Kconfig index e936cf420b48..b01bdc9baf89 100644 --- a/arch/arm/mach-integrator/Kconfig +++ b/arch/arm/mach-integrator/Kconfig @@ -1,5 +1,6 @@ menuconfig ARCH_INTEGRATOR - bool "ARM Ltd. Integrator family" if (ARCH_MULTI_V4T || ARCH_MULTI_V5 || ARCH_MULTI_V6) + bool "ARM Ltd. Integrator family" + depends on ARCH_MULTI_V4T || ARCH_MULTI_V5 || ARCH_MULTI_V6 select ARM_AMBA select ARM_PATCH_PHYS_VIRT if MMU select AUTO_ZRELADDR |