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-rockchip | |
| parent | 9cdac4a20a963d946f3ce13e6dd4943a780f5b54 (diff) | |
| parent | e324654294907a420ab3773efe8849a935f37bf0 (diff) | |
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-rockchip')
| -rw-r--r-- | arch/arm/mach-rockchip/Kconfig | 3 | ||||
| -rw-r--r-- | arch/arm/mach-rockchip/platsmp.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index ae4eb7cc4bcc..cef42fd886d1 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -1,5 +1,6 @@ config ARCH_ROCKCHIP - bool "Rockchip RK2928 and RK3xxx SOCs" if ARCH_MULTI_V7 + bool "Rockchip RK2928 and RK3xxx SOCs" + depends on ARCH_MULTI_V7 select PINCTRL select PINCTRL_ROCKCHIP select ARCH_HAS_RESET_CONTROLLER diff --git a/arch/arm/mach-rockchip/platsmp.c b/arch/arm/mach-rockchip/platsmp.c index 9a5b2e0502f3..d42a07e33482 100644 --- a/arch/arm/mach-rockchip/platsmp.c +++ b/arch/arm/mach-rockchip/platsmp.c @@ -360,7 +360,7 @@ static const struct smp_operations rk3036_smp_ops __initconst = { #endif }; -static struct smp_operations rockchip_smp_ops __initdata = { +static const struct smp_operations rockchip_smp_ops __initconst = { .smp_prepare_cpus = rockchip_smp_prepare_cpus, .smp_boot_secondary = rockchip_boot_secondary, #ifdef CONFIG_HOTPLUG_CPU |