From b7daf8777c149faf24a3b8882d782b42a3786c18 Mon Sep 17 00:00:00 2001
From: Deepak Saxena <dsaxena@plexity.net>
Date: Tue, 1 Nov 2005 22:32:12 +0000
Subject: [PATCH] --- yaml --- r: 12104 b: refs/heads/master c:
 73ee723e4c6d179c2e9496cc4caf160a18d95603 h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/arm/configs/ixp4xx_defconfig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f47d6718b8e9..87c25ca0ca3e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fbd9a6d7a927b2059d1d65441384ffb095f68e58
+refs/heads/master: 73ee723e4c6d179c2e9496cc4caf160a18d95603
diff --git a/trunk/arch/arm/configs/ixp4xx_defconfig b/trunk/arch/arm/configs/ixp4xx_defconfig
index c279e41ed10e..f74c926beb42 100644
--- a/trunk/arch/arm/configs/ixp4xx_defconfig
+++ b/trunk/arch/arm/configs/ixp4xx_defconfig
@@ -104,7 +104,7 @@ CONFIG_ARCH_IXCDP1100=y
 CONFIG_ARCH_PRPMC1100=y
 CONFIG_ARCH_IXDP4XX=y
 CONFIG_CPU_IXP46X=y
-CONFIG_MACH_GTWX5715=y
+# CONFIG_MACH_GTWX5715 is not set
 
 #
 # IXP4xx Options