commit d06d3f026fd51690c3425405ae76d76332debffe
author Linux Build Service Account <lnxbuild@localhost> Wed May 22 02:57:33 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed May 22 02:57:31 2013 -0700
tree d5795f8521cc23721e89a2cdc3cb21841fb3c48d
parent ca332fcb2668209355953b07c222457c7baeaabc
parent d587766b6893b5c114dadae70e3020b394794ef9

Merge "defconfig: 9625: Add CONFIG_MTD_CHAR to the config list"

arch/arm/configs/msm9625-perf_defconfig

diff --git a/arch/arm/configs/msm9625-perf_defconfig b/arch/arm/configs/msm9625-perf_defconfig
index f434199..c48eb79 100644
--- a/arch/arm/configs/msm9625-perf_defconfig
+++ b/arch/arm/configs/msm9625-perf_defconfig
@@ -161,6 +161,7 @@
 CONFIG_CFG80211=m
 CONFIG_NL80211_TESTMODE=y
 CONFIG_MTD=y
+CONFIG_MTD_CHAR=y
 CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_OF_PARTS=y
 CONFIG_MTD_BLOCK=y

arch/arm/configs/msm9625_defconfig

diff --git a/arch/arm/configs/msm9625_defconfig b/arch/arm/configs/msm9625_defconfig
index ba246e5..4f2a637 100644
--- a/arch/arm/configs/msm9625_defconfig
+++ b/arch/arm/configs/msm9625_defconfig
@@ -163,6 +163,7 @@
 CONFIG_CFG80211=m
 CONFIG_NL80211_TESTMODE=y
 CONFIG_MTD=y
+CONFIG_MTD_CHAR=y
 CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_OF_PARTS=y
 CONFIG_MTD_BLOCK=y