From 572e2ab3314105e7a86ab7d767a7d481a0d51ee0 Mon Sep 17 00:00:00 2001
From: Michael Hennerich <michael.hennerich@analog.com>
Date: Sun, 5 Aug 2007 18:55:30 +0800
Subject: [PATCH] --- yaml --- r: 65995 b: refs/heads/master c:
 7735cefc4583175486685fced2f457fbe0fd5855 h: refs/heads/master i:   65993:
 ea6fb342423763e6fee66066197874d439041138   65991:
 2f99e2e8b11b9643d28788f1d6f66050cb9f2036 v: v3

---
 [refs]                                | 2 +-
 trunk/arch/blackfin/mach-bf548/head.S | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d392b6492f2e..c4c6ef3a5517 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d945e2b3e421f2ce01b2eb260392f888406933f
+refs/heads/master: 7735cefc4583175486685fced2f457fbe0fd5855
diff --git a/trunk/arch/blackfin/mach-bf548/head.S b/trunk/arch/blackfin/mach-bf548/head.S
index e53d74d4c0a2..4c7d49f41187 100644
--- a/trunk/arch/blackfin/mach-bf548/head.S
+++ b/trunk/arch/blackfin/mach-bf548/head.S
@@ -379,6 +379,7 @@ ENTRY(_bfin_reset)
 	CLI R6;
 	SSYNC;
 
+#if 0 /* Need to determine later if this is here necessary for BF54x */
 #if defined(CONFIG_MTD_M25P80)
 /*
  * The following code fix the SPI flash reboot issue,
@@ -413,6 +414,7 @@ _delay_lab0_end:
 	nop;
 _delay_lab1_end:
 	nop;
+#endif
 #endif
 
 	/* Clear the bits 13-15 in SWRST if they werent cleared */