commit f3cb3ca4d6f2956d7db0a6761a4b3619746d98c0
author Linux Build Service Account <lnxbuild@localhost> Mon Jun 17 10:03:27 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Mon Jun 17 10:03:26 2013 -0700
tree 6d5c4a795ba17cb2ffef1e99741f6c6a1a955ae7
parent c5063678039a2ce2f7d0ad27970b287902d572fb
parent 7185ccd042a2c5e427e53015a43dafa005708989

Merge "defconfig: msm8610: Use correct csi and ispif version"

arch/arm/configs/msm8610-perf_defconfig

diff --git a/arch/arm/configs/msm8610-perf_defconfig b/arch/arm/configs/msm8610-perf_defconfig
index c27e863..9d104fd 100644
--- a/arch/arm/configs/msm8610-perf_defconfig
+++ b/arch/arm/configs/msm8610-perf_defconfig
@@ -273,12 +273,13 @@
 CONFIG_OV8825=y
 CONFIG_HI256=y
 CONFIG_MSM_CAMERA_SENSOR=y
-CONFIG_MSM_CPP=y
+# CONFIG_MSM_CPP is not set
 CONFIG_MSM_CCI=y
-CONFIG_MSM_CSI30_HEADER=y
+CONFIG_MSM_CSI22_HEADER=y
 CONFIG_MSM_CSIPHY=y
 CONFIG_MSM_CSID=y
 CONFIG_MSM_ISPIF=y
+CONFIG_MSM_ISPIF_V1=y
 CONFIG_MSMB_CAMERA=y
 CONFIG_OV9724=y
 CONFIG_SP1628=y

arch/arm/configs/msm8610_defconfig

diff --git a/arch/arm/configs/msm8610_defconfig b/arch/arm/configs/msm8610_defconfig
index a1b0920..0587e50 100644
--- a/arch/arm/configs/msm8610_defconfig
+++ b/arch/arm/configs/msm8610_defconfig
@@ -272,10 +272,10 @@
 CONFIG_HI256=y
 CONFIG_MSM_CAMERA_SENSOR=y
 CONFIG_MSM_CCI=y
-CONFIG_MSM_CSI20_HEADER=y
 CONFIG_MSM_CSIPHY=y
 CONFIG_MSM_CSID=y
 CONFIG_MSM_ISPIF=y
+CONFIG_MSM_ISPIF_V1=y
 CONFIG_MSMB_CAMERA=y
 CONFIG_MSM_CSI22_HEADER=y
 CONFIG_OV9724=y