From 9f9c77bde97106a466c38836aebed11e457f010c Mon Sep 17 00:00:00 2001
From: "Robert P. J. Day" <rpjday@crashcourse.ca>
Date: Wed, 21 Nov 2007 14:51:49 -0800
Subject: [PATCH] --- yaml --- r: 77462 b: refs/heads/master c:
 e173dbf68869dd1fe64c16b8d6ae2fbe6a3b2f89 h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/arm/configs/collie_defconfig | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e1fe3cfb6311..f483457a873c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c5f333831fe2ff1656f954aabdb3eb8c276169cc
+refs/heads/master: e173dbf68869dd1fe64c16b8d6ae2fbe6a3b2f89
diff --git a/trunk/arch/arm/configs/collie_defconfig b/trunk/arch/arm/configs/collie_defconfig
index 970c8c772eb7..4264e273202d 100644
--- a/trunk/arch/arm/configs/collie_defconfig
+++ b/trunk/arch/arm/configs/collie_defconfig
@@ -367,7 +367,6 @@ CONFIG_MTD_CFI_UTIL=y
 # CONFIG_MTD_RAM is not set
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_ABSENT is not set
-CONFIG_MTD_OBSOLETE_CHIPS=y
 CONFIG_MTD_SHARP=y
 # CONFIG_MTD_XIP is not set