diff options
| author | John Stultz <john.stultz@linaro.org> | 2011-11-11 15:29:25 -0800 |
|---|---|---|
| committer | John Stultz <john.stultz@linaro.org> | 2011-11-11 15:29:25 -0800 |
| commit | c3e5127312f97482a6a09c0df602c726675eff5b (patch) | |
| tree | 9082d8201a1daac5ff019ef50322d551711eb250 /arch/arm/kernel/smp_scu.c | |
| parent | 5e537f041bd05cddee0d2a2fb3013ee642064cc6 (diff) | |
| parent | f171dfebbdf1de4b6ca267285739e190f95f84cc (diff) | |
Merge branch 'upstream/linaro-3.1' into linaro-android-3.1-agreen-rebaselinux-linaro-3.1-2011.11-0-android-0
Diffstat (limited to 'arch/arm/kernel/smp_scu.c')
| -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 7fcddb75c87..8f5dd796335 100644 --- a/arch/arm/kernel/smp_scu.c +++ b/arch/arm/kernel/smp_scu.c @@ -34,7 +34,7 @@ unsigned int __init scu_get_core_count(void __iomem *scu_base) /* * Enable the SCU */ -void __init scu_enable(void __iomem *scu_base) +void scu_enable(void __iomem *scu_base) { u32 scu_ctrl; |