From a130de09691276f3ed4478bc6fd88f064ba21763 Mon Sep 17 00:00:00 2001
From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Date: Wed, 6 Feb 2013 10:06:24 -0300
Subject: [PATCH] --- yaml --- r: 359921 b: refs/heads/master c:
 d0b8a49c4bddca6e9d55fc2eb1e151a7403a8093 h: refs/heads/master i:   359919:
 8474aa2e7b3846410f35b08c92c29f61f15897aa v: v3

---
 [refs]                                 | 2 +-
 trunk/arch/arm/configs/mvebu_defconfig | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 57c069b53168..9ee7fa2f9812 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d2d1ef4f021d8a56f787af60a0b44ee758ef5013
+refs/heads/master: d0b8a49c4bddca6e9d55fc2eb1e151a7403a8093
diff --git a/trunk/arch/arm/configs/mvebu_defconfig b/trunk/arch/arm/configs/mvebu_defconfig
index 12da3230bba0..da6ad6bd41e0 100644
--- a/trunk/arch/arm/configs/mvebu_defconfig
+++ b/trunk/arch/arm/configs/mvebu_defconfig
@@ -42,6 +42,9 @@ CONFIG_I2C=y
 CONFIG_SPI=y
 CONFIG_SPI_ORION=y
 CONFIG_I2C_MV64XXX=y
+CONFIG_MTD=y
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_M25P80=y
 CONFIG_SERIAL_8250_DW=y
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_SYSFS=y