commit 8b659c19c904037d5aed754576956691719ad324
author Aditya Jonnalagadda <ajonnala@codeaurora.org> Fri Sep 20 19:13:39 2013 +0530
committer Gerrit - the friendly Code Review server <code-review@localhost> Sat Oct 05 22:26:45 2013 -0700
tree 786847a8417cc4f5725f3e97fd56a2fe977ff26d
parent 4a9678cfbef0a1f95306cfc47b3ab36ef1548bf8

defconfig: msm: 8610: Enable imx134 for 8610

Enable imx134 sensor driver compile for 8610.

Conflicts:

	arch/arm/configs/msm8610-perf_defconfig
	arch/arm/configs/msm8610_defconfig

Change-Id: Iccedadef1f8b782182f2c3cd697209d08ca28656
Signed-off-by: Aditya Jonnalagadda <ajonnala@codeaurora.org>

arch/arm/configs/msm8610-perf_defconfig

diff --git a/arch/arm/configs/msm8610-perf_defconfig b/arch/arm/configs/msm8610-perf_defconfig
index 1a197a3..b91ce3c 100644
--- a/arch/arm/configs/msm8610-perf_defconfig
+++ b/arch/arm/configs/msm8610-perf_defconfig
@@ -284,6 +284,7 @@
 CONFIG_HI256=y
 CONFIG_OV12830=y
 CONFIG_OV5648=y
+CONFIG_IMX134=y
 CONFIG_MSM_CAMERA_SENSOR=y
 # CONFIG_MSM_CPP is not set
 CONFIG_MSM_EEPROM=y

arch/arm/configs/msm8610_defconfig

diff --git a/arch/arm/configs/msm8610_defconfig b/arch/arm/configs/msm8610_defconfig
index 8238414..93e8f0f 100644
--- a/arch/arm/configs/msm8610_defconfig
+++ b/arch/arm/configs/msm8610_defconfig
@@ -285,6 +285,7 @@
 CONFIG_s5k4e1=y
 CONFIG_HI256=y
 CONFIG_OV12830=y
+CONFIG_IMX134=y
 CONFIG_MSM_CAMERA_SENSOR=y
 CONFIG_MSM_EEPROM=y
 CONFIG_MSM_CCI=y