diff options
author | Arnd Bergmann | 2015-12-18 17:07:52 +0100 |
---|---|---|
committer | Arnd Bergmann | 2015-12-18 17:07:52 +0100 |
commit | 11c7a6c5a3232e2ff1127d80d609daa95df5d5d4 (patch) | |
tree | 52a7bfe7994eb7f0c9d4b9301ad3c27f9bb9ad71 /arch/arm/mach-sti/smp.h | |
parent | ARM: realview: build realview-dt SMP support only when used (diff) | |
parent | ARM: use "depends on" for SoC configs instead of "if" after prompt (diff) | |
download | kernel-qcow2-linux-11c7a6c5a3232e2ff1127d80d609daa95df5d5d4.tar.gz kernel-qcow2-linux-11c7a6c5a3232e2ff1127d80d609daa95df5d5d4.tar.xz kernel-qcow2-linux-11c7a6c5a3232e2ff1127d80d609daa95df5d5d4.zip |
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-sti/smp.h')
-rw-r--r-- | arch/arm/mach-sti/smp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-sti/smp.h b/arch/arm/mach-sti/smp.h index ae22707d301f..d8a2f8758490 100644 --- a/arch/arm/mach-sti/smp.h +++ b/arch/arm/mach-sti/smp.h @@ -12,7 +12,7 @@ #ifndef __MACH_STI_SMP_H #define __MACH_STI_SMP_H -extern struct smp_operations sti_smp_ops; +extern const struct smp_operations sti_smp_ops; void sti_secondary_startup(void); |