commit 5b6fc2c73332a4bd0f5b25a532207ddd47284284
author Linux Build Service Account <lnxbuild@localhost> Sat Jun 22 08:13:45 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Sat Jun 22 08:13:45 2013 -0700
tree dbc3c9e46b378ce4a8b196ba15076a1ec9a29e9e
parent 4f560e9b3d47a4c90b2374d25c3bd2c071c3a020
parent 99a2036cb8fa173206e180d43a5b3525bd2ad74f

Merge "defconfig: add S5k4e1 defconfig for msm8x12 qrd board"

arch/arm/configs/msm8610-perf_defconfig

diff --git a/arch/arm/configs/msm8610-perf_defconfig b/arch/arm/configs/msm8610-perf_defconfig
index 2cfad74..3a08849 100644
--- a/arch/arm/configs/msm8610-perf_defconfig
+++ b/arch/arm/configs/msm8610-perf_defconfig
@@ -272,6 +272,7 @@
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
 # CONFIG_MSM_CAMERA is not set
 CONFIG_OV8825=y
+CONFIG_s5k4e1=y
 CONFIG_HI256=y
 CONFIG_MSM_CAMERA_SENSOR=y
 # CONFIG_MSM_CPP is not set

arch/arm/configs/msm8610_defconfig

diff --git a/arch/arm/configs/msm8610_defconfig b/arch/arm/configs/msm8610_defconfig
index cf261d2..1998293 100644
--- a/arch/arm/configs/msm8610_defconfig
+++ b/arch/arm/configs/msm8610_defconfig
@@ -270,6 +270,7 @@
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
 # CONFIG_MSM_CAMERA is not set
 CONFIG_OV8825=y
+CONFIG_s5k4e1=y
 CONFIG_HI256=y
 CONFIG_MSM_CAMERA_SENSOR=y
 CONFIG_MSM_CCI=y