From 324a726704f42522313447f1b455435a63767f75 Mon Sep 17 00:00:00 2001
From: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Date: Mon, 4 Mar 2013 13:48:09 +0200
Subject: [PATCH] --- yaml --- r: 374713 b: refs/heads/master c:
 b9c637b56c719cdeaf68a85f9f08541b8e394607 h: refs/heads/master i:   374711:
 8b5baa0eafcb30196a9101acbfacb5eadb7b65ab v: v3

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

diff --git a/[refs] b/[refs]
index 1d9be7e2142e..bd59310b44e6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f7025a43a9da26fb79684c6b75ddfe6b1b5986bf
+refs/heads/master: b9c637b56c719cdeaf68a85f9f08541b8e394607
diff --git a/trunk/arch/arm/configs/lpc32xx_defconfig b/trunk/arch/arm/configs/lpc32xx_defconfig
index 92386b20bd09..e77326f2b7c4 100644
--- a/trunk/arch/arm/configs/lpc32xx_defconfig
+++ b/trunk/arch/arm/configs/lpc32xx_defconfig
@@ -55,7 +55,6 @@ CONFIG_MTD_CHAR=y
 CONFIG_MTD_BLOCK=y
 CONFIG_MTD_M25P80=y
 CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_MUSEUM_IDS=y
 CONFIG_MTD_NAND_SLC_LPC32XX=y
 CONFIG_MTD_NAND_MLC_LPC32XX=y
 CONFIG_BLK_DEV_LOOP=y