From 1269eff2c6f625cd6b9259d893026b07ec862715 Mon Sep 17 00:00:00 2001
From: Michael-Luke Jones <mlj28@cam.ac.uk>
Date: Sat, 26 May 2007 21:58:07 +0100
Subject: [PATCH] --- yaml --- r: 59240 b: refs/heads/master c:
 d85ed59524d936f4c2657ba39a483b4ab373a59e h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/arch/arm/boot/compressed/head-xscale.S | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 2828673dfeb1..bc58d52ffcd0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ddaca4a26efc0716708f027914bf5508e2d86cc7
+refs/heads/master: d85ed59524d936f4c2657ba39a483b4ab373a59e
diff --git a/trunk/arch/arm/boot/compressed/head-xscale.S b/trunk/arch/arm/boot/compressed/head-xscale.S
index 73c5d9e0201c..236bbe578312 100644
--- a/trunk/arch/arm/boot/compressed/head-xscale.S
+++ b/trunk/arch/arm/boot/compressed/head-xscale.S
@@ -41,11 +41,6 @@ __XScale_start:
 		mov	r7, #MACH_TYPE_COTULLA_IDP
 #endif
 
-#ifdef  CONFIG_MACH_GTWX5715
-               mov     r7, #(MACH_TYPE_GTWX5715 & 0xff)
-               orr     r7, r7, #(MACH_TYPE_GTWX5715 & 0xff00)
-#endif
-
 #ifdef CONFIG_ARCH_IXP2000
 		mov	r1, #-1
 		mov	r0, #0xd6000000