From a495e25b3002fb07a58e0ee11ef52f5b32c99f54 Mon Sep 17 00:00:00 2001
From: Greg Ungerer <gerg@snapgear.com>
Date: Thu, 1 May 2008 12:17:21 +1000
Subject: [PATCH] --- yaml --- r: 95700 b: refs/heads/master c:
 cff28b56bdafd314836f4193b638b88d9b3cb5b1 h: refs/heads/master v: v3

---
 [refs]                                      | 2 +-
 trunk/arch/m68knommu/platform/5307/config.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 7470d01ca321..cfda0cfcc871 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 188a9a4841c9b4a56cdd9b58761a882db4873f0c
+refs/heads/master: cff28b56bdafd314836f4193b638b88d9b3cb5b1
diff --git a/trunk/arch/m68knommu/platform/5307/config.c b/trunk/arch/m68knommu/platform/5307/config.c
index 92dc862fa826..11cff6625dcc 100644
--- a/trunk/arch/m68knommu/platform/5307/config.c
+++ b/trunk/arch/m68knommu/platform/5307/config.c
@@ -124,8 +124,7 @@ void __init config_BSP(char *commandp, int size)
 	mcf_setimr(MCFSIM_IMR_MASKALL);
 
 #if defined(CONFIG_NETtel) || defined(CONFIG_eLIA) || \
-      defined(CONFIG_DISKtel) || defined(CONFIG_SECUREEDGEMP3) || \
-      defined(CONFIG_CLEOPATRA)
+    defined(CONFIG_SECUREEDGEMP3) || defined(CONFIG_CLEOPATRA)
 	/* Copy command line from FLASH to local buffer... */
 	memcpy(commandp, (char *) 0xf0004000, size);
 	commandp[size-1] = 0;