From 605a0e5858d80c3c66d0627960503ab979c0cfb2 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue, 21 Jun 2011 18:59:33 +0100
Subject: [PATCH] --- yaml --- r: 258232 b: refs/heads/master c:
 3125af241cdb5a2421aad9f710b2744228a79084 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/arch/arm/mach-sa1100/sleep.S | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 10190a0f964e..2fbdbc3a8f93 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b69874e4f530b0103e507f695c010d00cb85a4df
+refs/heads/master: 3125af241cdb5a2421aad9f710b2744228a79084
diff --git a/trunk/arch/arm/mach-sa1100/sleep.S b/trunk/arch/arm/mach-sa1100/sleep.S
index 04f2a618d4ef..122ab3c66923 100644
--- a/trunk/arch/arm/mach-sa1100/sleep.S
+++ b/trunk/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