From 869d0468a9f7bb36bf4f072b376b2a5314d67886 Mon Sep 17 00:00:00 2001
From: Kevin Hilman <khilman@deeprootsystems.com>
Date: Thu, 29 Jan 2009 08:57:18 -0800
Subject: [PATCH] --- yaml --- r: 130846 b: refs/heads/master c:
 0dc23d704874e892c3fb5f2c0e4dfbef3c9c6edf h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/arch/arm/mach-omap2/sleep24xx.S | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ed87357541e7..4fd130818072 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5461af5af5c6a7fee78978aafe720541bf3a2f55
+refs/heads/master: 0dc23d704874e892c3fb5f2c0e4dfbef3c9c6edf
diff --git a/trunk/arch/arm/mach-omap2/sleep24xx.S b/trunk/arch/arm/mach-omap2/sleep24xx.S
index 43336b93b21c..bf9e96105e11 100644
--- a/trunk/arch/arm/mach-omap2/sleep24xx.S
+++ b/trunk/arch/arm/mach-omap2/sleep24xx.S
@@ -93,9 +93,8 @@ ENTRY(omap24xx_cpu_suspend)
 	orr	r4, r4, #0x40		@ enable self refresh on idle req
 	mov	r5, #0x2000		@ set delay (DPLL relock + DLL relock)
 	str	r4, [r2]		@ make it so
-	mov	r2, #0
 	nop
-	mcr	p15, 0, r2, c7, c0, 4	@ wait for interrupt
+	mcr	p15, 0, r3, c7, c0, 4	@ wait for interrupt
 	nop
 loop:
 	subs	r5, r5, #0x1		@ awake, wait just a bit