Message ID | E1QZpHv-0005lo-6u@rmk-PC.arm.linux.org.uk (mailing list archive) |
---|---|
State | Awaiting Upstream |
Delegated to: | Kevin Hilman |
Headers | show |
diff --git a/arch/arm/mach-sa1100/sleep.S b/arch/arm/mach-sa1100/sleep.S index 04f2a61..122ab3c 100644 --- a/arch/arm/mach-sa1100/sleep.S +++ b/arch/arm/mach-sa1100/sleep.S @@ -147,5 +147,4 @@ sa1110_sdram_controller_fix: */ .align 5 sa1100_cpu_resume: - mcr p15, 0, r1, c15, c1, 2 @ enable clock switching ldmfd sp!, {r4 - r12, pc} @ return to caller
This is now taken care of by calling cpu_proc_init() in the resume path, so eliminate this unnecessary call. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> --- arch/arm/mach-sa1100/sleep.S | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)