commit c6a7f9320a941494ff6dbaddfda647613626bd75
author Linux Build Service Account <lnxbuild@localhost> Thu Aug 09 13:01:55 2012 -0700
committer QuIC Gerrit Code Review <code-review@localhost> Thu Aug 09 13:01:55 2012 -0700
tree ee19c8b7d4ddb276c8d00516c6f411b4f4f9a0c6
parent 6e466fb23144cf38b57f81672bfd752d995c095b
parent 1fbcbfe6ea5cb946c2c60e208912913b129607b7

Merge "defconfig: Enable Mercury decoder." into msm-3.4

arch/arm/configs/msm8960-perf_defconfig

diff --git a/arch/arm/configs/msm8960-perf_defconfig b/arch/arm/configs/msm8960-perf_defconfig
index 1f2e285..3854403 100644
--- a/arch/arm/configs/msm8960-perf_defconfig
+++ b/arch/arm/configs/msm8960-perf_defconfig
@@ -356,6 +356,7 @@
 CONFIG_IMX074_EEPROM=y
 CONFIG_IMX091_EEPROM=y
 CONFIG_MSM_GEMINI=y
+CONFIG_MSM_MERCURY=y
 CONFIG_MSM_CSI20_HEADER=y
 CONFIG_S5K3L1YX=y
 CONFIG_IMX091=y

arch/arm/configs/msm8960_defconfig

diff --git a/arch/arm/configs/msm8960_defconfig b/arch/arm/configs/msm8960_defconfig
index 8c79847..06501ba 100644
--- a/arch/arm/configs/msm8960_defconfig
+++ b/arch/arm/configs/msm8960_defconfig
@@ -359,6 +359,7 @@
 CONFIG_IMX074_EEPROM=y
 CONFIG_IMX091_EEPROM=y
 CONFIG_MSM_GEMINI=y
+CONFIG_MSM_MERCURY=y
 CONFIG_MSM_CSI20_HEADER=y
 CONFIG_S5K3L1YX=y
 CONFIG_IMX091=y