From 2dbe5f14fe0e50da8683120f425cce2827766ca9 Mon Sep 17 00:00:00 2001
From: Jaccon Bastiaansen <jaccon.bastiaansen@gmail.com>
Date: Thu, 29 Dec 2011 11:38:29 +0100
Subject: [PATCH] --- yaml --- r: 281731 b: refs/heads/master c:
 1a96571db0a80dbbb935dee26589dd528da0ed06 h: refs/heads/master i:   281729:
 7d71c0fdfd1755775645b1a3806bfdd37e9b33a0   281727:
 0c0bbebbce9c7364f6bc1e4c08fc92d71fe9beef v: v3

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

diff --git a/[refs] b/[refs]
index f72408f2303f..d6fb0cde64be 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 039d7ba4bcfb1e0040be6f7812a410e6744ce69e
+refs/heads/master: 1a96571db0a80dbbb935dee26589dd528da0ed06
diff --git a/trunk/arch/arm/configs/imx_v4_v5_defconfig b/trunk/arch/arm/configs/imx_v4_v5_defconfig
index 11a4192197c8..fccb4703bacb 100644
--- a/trunk/arch/arm/configs/imx_v4_v5_defconfig
+++ b/trunk/arch/arm/configs/imx_v4_v5_defconfig
@@ -67,7 +67,6 @@ CONFIG_MTD_CFI=y
 CONFIG_MTD_CFI_ADV_OPTIONS=y
 CONFIG_MTD_CFI_GEOMETRY=y
 # CONFIG_MTD_MAP_BANK_WIDTH_1 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_4 is not set
 # CONFIG_MTD_CFI_I2 is not set
 CONFIG_MTD_CFI_INTELEXT=y
 CONFIG_MTD_PHYSMAP=y