commit f5f5abced031270b083b491b6f5b563d722ab802
author Linux Build Service Account <lnxbuild@localhost> Sun Jun 16 00:07:36 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Sun Jun 16 00:07:36 2013 -0700
tree b90949af74538dea2527872f97e5cb29b1bce762
parent f9a8f848fe86a7838a4c98bc8534957e07d72742
parent 8b76e5004a1a1afa5681d5919e6ebc2b05c29bfe

Merge "defconfig: add Hi256 defconfig  for msm8x10 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 d5e230d..2990091 100644
--- a/arch/arm/configs/msm8610-perf_defconfig
+++ b/arch/arm/configs/msm8610-perf_defconfig
@@ -271,6 +271,7 @@
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
 # CONFIG_MSM_CAMERA is not set
 CONFIG_OV8825=y
+CONFIG_HI256=y
 CONFIG_MSM_CAMERA_SENSOR=y
 CONFIG_MSM_CPP=y
 CONFIG_MSM_CCI=y

arch/arm/configs/msm8610_defconfig

diff --git a/arch/arm/configs/msm8610_defconfig b/arch/arm/configs/msm8610_defconfig
index b435924..64f9841 100644
--- a/arch/arm/configs/msm8610_defconfig
+++ b/arch/arm/configs/msm8610_defconfig
@@ -269,6 +269,7 @@
 CONFIG_VIDEO_V4L2_SUBDEV_API=y
 # CONFIG_MSM_CAMERA is not set
 CONFIG_OV8825=y
+CONFIG_HI256=y
 CONFIG_MSM_CAMERA_SENSOR=y
 CONFIG_MSM_CCI=y
 CONFIG_MSM_CSI20_HEADER=y