diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-04-26 02:28:57 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-04-26 02:28:57 +0200 |
| commit | b5ebbcdb53260991a82a8800480dcb06dcffeef9 (patch) | |
| tree | 03f6008754f381e6d11d44f2dbb1ca09c732a121 /arch/arm/include | |
| parent | 02da2d72174c61988eb4456b53f405e3ebdebce4 (diff) | |
| parent | 5e7c17df795e462c70a43f1b3b670e08efefe8fd (diff) | |
| download | talos-obmc-linux-b5ebbcdb53260991a82a8800480dcb06dcffeef9.tar.gz talos-obmc-linux-b5ebbcdb53260991a82a8800480dcb06dcffeef9.zip | |
Merge branch 'cpuidle/4.7' of http://git.linaro.org/people/daniel.lezcano/linux into tmp
Pull ARM cpuidle changes for v4.7 from Daniel Lezcano.
* 'cpuidle/4.7' of http://git.linaro.org/people/daniel.lezcano/linux:
drivers: firmware: psci: use const and __initconst for psci_cpuidle_ops
soc: qcom: spm: Use const and __initconst for qcom_cpuidle_ops
ARM: cpuidle: constify return value of arm_cpuidle_get_ops()
ARM: cpuidle: add const qualifier to cpuidle_ops member in structures
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/cpuidle.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/cpuidle.h b/arch/arm/include/asm/cpuidle.h index 3848259bebf8..baefe1d51517 100644 --- a/arch/arm/include/asm/cpuidle.h +++ b/arch/arm/include/asm/cpuidle.h @@ -36,7 +36,7 @@ struct cpuidle_ops { struct of_cpuidle_method { const char *method; - struct cpuidle_ops *ops; + const struct cpuidle_ops *ops; }; #define CPUIDLE_METHOD_OF_DECLARE(name, _method, _ops) \ |
