From 567fc700c4551cbab3b4851527b97d0b925fe25a Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Fri, 21 Mar 2008 18:07:04 +0900
Subject: [PATCH] --- yaml --- r: 90923 b: refs/heads/master c:
 5c0cbd74bb56aeb7f3de883ab79c5f501622ccb1 h: refs/heads/master i:   90921:
 08fce06e1b52ce866cd72e47104b744dac619301   90919:
 b8d456bd0194fa33beee0b8b215d6004ede3bee6 v: v3

---
 [refs]                         | 2 +-
 trunk/arch/sh/lib/clear_page.S | 6 +++---
 trunk/arch/sh/lib/copy_page.S  | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 71385db897eb..094fc939f4aa 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2163b4cb01cd79cd1291696fc4636740026d61cb
+refs/heads/master: 5c0cbd74bb56aeb7f3de883ab79c5f501622ccb1
diff --git a/trunk/arch/sh/lib/clear_page.S b/trunk/arch/sh/lib/clear_page.S
index 3539123fe517..8342bfbde64c 100644
--- a/trunk/arch/sh/lib/clear_page.S
+++ b/trunk/arch/sh/lib/clear_page.S
@@ -27,11 +27,11 @@ ENTRY(clear_page)
 	mov	#0,r0
 	!
 1:
-#if defined(CONFIG_CPU_SH3)
-	mov.l	r0,@r4
-#elif defined(CONFIG_CPU_SH4)
+#if defined(CONFIG_CPU_SH4)
 	movca.l	r0,@r4
 	mov	r4,r1
+#else
+	mov.l	r0,@r4
 #endif
 	add	#32,r4
 	mov.l	r0,@-r4
diff --git a/trunk/arch/sh/lib/copy_page.S b/trunk/arch/sh/lib/copy_page.S
index e002b91c8752..5d12e657be34 100644
--- a/trunk/arch/sh/lib/copy_page.S
+++ b/trunk/arch/sh/lib/copy_page.S
@@ -41,11 +41,11 @@ ENTRY(copy_page)
 	mov.l	@r11+,r5
 	mov.l	@r11+,r6
 	mov.l	@r11+,r7
-#if defined(CONFIG_CPU_SH3)
-	mov.l	r0,@r10
-#elif defined(CONFIG_CPU_SH4)
+#if defined(CONFIG_CPU_SH4)
 	movca.l	r0,@r10
 	mov	r10,r0
+#else
+	mov.l	r0,@r10
 #endif
 	add	#32,r10
 	mov.l	r7,@-r10