commit bd404367576fa00bde02187899ba3824fb8a48f2
author Linux Build Service Account <lnxbuild@localhost> Sun Mar 11 17:01:37 2012 -0700
committer QuIC Gerrit Code Review <code-review@localhost> Sun Mar 11 17:01:37 2012 -0700
tree 5583c25c3ddf4bbf92e4da2e6b06d1e089fa2703
parent 2a43c916a927acb3bbf0148a58eedbeb9a00444f
parent 3137c602f6a5e4214a27cbf1f16b3cac3dc322b1

Merge "defconfig: msm7627a: Disable RC_CORE and DEBUG_LL" into msm-3.0

arch/arm/configs/msm7627a-perf_defconfig

diff --git a/arch/arm/configs/msm7627a-perf_defconfig b/arch/arm/configs/msm7627a-perf_defconfig
index 2af5ce4..31e04f1 100644
--- a/arch/arm/configs/msm7627a-perf_defconfig
+++ b/arch/arm/configs/msm7627a-perf_defconfig
@@ -231,6 +231,8 @@
 CONFIG_MARIMBA_CORE=y
 CONFIG_MEDIA_SUPPORT=y
 CONFIG_VIDEO_DEV=y
+# CONFIG_RC_CORE is not set
+# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
 # CONFIG_MT9T013 is not set
 # CONFIG_MT9D112 is not set
 CONFIG_OV5640=y
@@ -337,8 +339,6 @@
 CONFIG_ENABLE_DEFAULT_TRACERS=y
 CONFIG_DYNAMIC_DEBUG=y
 CONFIG_DEBUG_USER=y
-CONFIG_DEBUG_LL=y
-CONFIG_EARLY_PRINTK=y
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_TWOFISH=y
 CONFIG_CRC_CCITT=y

arch/arm/configs/msm7627a_defconfig

diff --git a/arch/arm/configs/msm7627a_defconfig b/arch/arm/configs/msm7627a_defconfig
index 0bbad62..bb54f68 100644
--- a/arch/arm/configs/msm7627a_defconfig
+++ b/arch/arm/configs/msm7627a_defconfig
@@ -232,6 +232,8 @@
 CONFIG_MARIMBA_CORE=y
 CONFIG_MEDIA_SUPPORT=y
 CONFIG_VIDEO_DEV=y
+# CONFIG_RC_CORE is not set
+# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
 # CONFIG_MT9T013 is not set
 # CONFIG_MT9D112 is not set
 CONFIG_OV5640=y
@@ -346,8 +348,6 @@
 CONFIG_ENABLE_DEFAULT_TRACERS=y
 CONFIG_DYNAMIC_DEBUG=y
 CONFIG_DEBUG_USER=y
-CONFIG_DEBUG_LL=y
-CONFIG_EARLY_PRINTK=y
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_TWOFISH=y
 CONFIG_CRC_CCITT=y