| commit | 02f58200b050574936850d41e503d0cbf286d580 | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@localhost> | Thu Jun 27 01:03:20 2013 -0700 |
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | Thu Jun 27 01:03:19 2013 -0700 |
| tree | ac3e3c792e2842dbb6185a2c2ce0f27e6b88a21e | |
| parent | e8a6e061f6108612d3a1a89efd8fe9f35d391899 [diff] | |
| parent | 32da2e14c38c8b393cf5ad87e1c8b1b56a0abeb8 [diff] |
Merge "defconfig: msm8612: Enable light/proximity sensor driver STK3X1X"
diff --git a/arch/arm/configs/msm8610-perf_defconfig b/arch/arm/configs/msm8610-perf_defconfig index 07f7ed9..010bc10 100644 --- a/arch/arm/configs/msm8610-perf_defconfig +++ b/arch/arm/configs/msm8610-perf_defconfig
@@ -384,3 +384,4 @@ CONFIG_CRC_CCITT=y CONFIG_INPUT_KXTJ9=y CONFIG_MSM_RPM_RBCPR_STATS_V2_LOG=y +CONFIG_SENSORS_STK3X1X=y
diff --git a/arch/arm/configs/msm8610_defconfig b/arch/arm/configs/msm8610_defconfig index 34c0905..7225ec5 100644 --- a/arch/arm/configs/msm8610_defconfig +++ b/arch/arm/configs/msm8610_defconfig
@@ -427,3 +427,4 @@ CONFIG_CRC_CCITT=y CONFIG_INPUT_KXTJ9=y CONFIG_MSM_RPM_RBCPR_STATS_V2_LOG=y +CONFIG_SENSORS_STK3X1X=y