commit f96480aca88a6808c5c5e09a823dad33d13cf262
author Linux Build Service Account <lnxbuild@localhost> Fri Apr 19 07:56:08 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Apr 19 07:56:07 2013 -0700
tree f0d2b2b8b0c38dc558f4778a750120e22e15e57c
parent af40a85248fde00ebd89341054c6e52f319b3b5d
parent e7edb2e8df5990e148f05fa913efebb12db230fb

Merge "defconfig: msm9625: disable display by default"

arch/arm/configs/msm9625-perf_defconfig

diff --git a/arch/arm/configs/msm9625-perf_defconfig b/arch/arm/configs/msm9625-perf_defconfig
index 42acd99..ae73bad 100644
--- a/arch/arm/configs/msm9625-perf_defconfig
+++ b/arch/arm/configs/msm9625-perf_defconfig
@@ -230,9 +230,6 @@
 CONFIG_REGULATOR_QPNP=y
 CONFIG_ION=y
 CONFIG_ION_MSM=y
-CONFIG_FB=y
-CONFIG_FB_MSM=y
-CONFIG_FB_MSM_QPIC_PANEL_DETECT=y
 CONFIG_SOUND=y
 CONFIG_SND=y
 CONFIG_SND_SOC=y

arch/arm/configs/msm9625_defconfig

diff --git a/arch/arm/configs/msm9625_defconfig b/arch/arm/configs/msm9625_defconfig
index 041e89a..f7c3bff 100644
--- a/arch/arm/configs/msm9625_defconfig
+++ b/arch/arm/configs/msm9625_defconfig
@@ -231,9 +231,6 @@
 CONFIG_REGULATOR_QPNP=y
 CONFIG_ION=y
 CONFIG_ION_MSM=y
-CONFIG_FB=y
-CONFIG_FB_MSM=y
-CONFIG_FB_MSM_QPIC_PANEL_DETECT=y
 CONFIG_SOUND=y
 CONFIG_SND=y
 CONFIG_SND_SOC=y