diff options
author | Shawn Guo <shawn.guo@linaro.org> | 2011-09-25 03:25:43 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-10-17 04:02:43 -0400 |
commit | 26a527e69d6e6077bff9e2cddcb08337ac33a52d (patch) | |
tree | 4515bfd0c960ea02cfff0019e265f05a809bba6f /arch/arm | |
parent | 267840f3397fd9f6a2bdde14de38b9d29d525d7b (diff) |
ARM: 7100/1: smp_scu: remove __init annotation from scu_enable()
When Cortex-A9 MPCore resumes from Dormant or Shutdown modes,
SCU needs to be re-enabled. This patch removes __init annotation
from function scu_enable(), so that platform resume procedure can
call it to re-enable SCU.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/kernel/smp_scu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/smp_scu.c b/arch/arm/kernel/smp_scu.c index 79ed5e7f204a..5b6d536cbfe3 100644 --- a/arch/arm/kernel/smp_scu.c +++ b/arch/arm/kernel/smp_scu.c | |||
@@ -33,7 +33,7 @@ unsigned int __init scu_get_core_count(void __iomem *scu_base) | |||
33 | /* | 33 | /* |
34 | * Enable the SCU | 34 | * Enable the SCU |
35 | */ | 35 | */ |
36 | void __init scu_enable(void __iomem *scu_base) | 36 | void scu_enable(void __iomem *scu_base) |
37 | { | 37 | { |
38 | u32 scu_ctrl; | 38 | u32 scu_ctrl; |
39 | 39 | ||