summaryrefslogtreecommitdiff
path: root/arch/arm/mach-sa1100
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-06-21 18:59:33 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-06-24 08:47:15 +0100
commit3125af241cdb5a2421aad9f710b2744228a79084 (patch)
tree8b8226b303761399ab0de73d1ad384b3175995e5 /arch/arm/mach-sa1100
parentb69874e4f530b0103e507f695c010d00cb85a4df (diff)
ARM: pm: sa1100: no need to re-enable clock switching
This is now taken care of by calling cpu_proc_init() in the resume path, so eliminate this unnecessary call. Tested-by: Kevin Hilman <khilman@ti.com> Acked-by: Jean Pihet <j-pihet@ti.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-sa1100')
-rw-r--r--arch/arm/mach-sa1100/sleep.S1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-sa1100/sleep.S b/arch/arm/mach-sa1100/sleep.S
index 04f2a618d4ef..122ab3c66923 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