From f690c68d4559aed6953d7337f317b898da75f26b Mon Sep 17 00:00:00 2001 From: Artem Bityutskiy Date: Wed, 27 Mar 2013 09:36:59 +0100 Subject: [PATCH] --- yaml --- r: 370574 b: refs/heads/master c: d41655ee22c8a86c3ebba2a648f11ca4696140de h: refs/heads/master 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 4f7b48438e7e..fad13b280e29 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ea7faa43a7577d548ffe44527c2f444c256a227d +refs/heads/master: d41655ee22c8a86c3ebba2a648f11ca4696140de diff --git a/trunk/arch/arm/configs/lpc32xx_defconfig b/trunk/arch/arm/configs/lpc32xx_defconfig index 96cf6388d6af..e534b5efe803 100644 --- a/trunk/arch/arm/configs/lpc32xx_defconfig +++ b/trunk/arch/arm/configs/lpc32xx_defconfig @@ -58,7 +58,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