diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2014-06-13 08:35:26 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2014-06-13 08:35:25 -0700 |
| commit | 609c8181a835e89c559125e250dfc20c261f33fc (patch) | |
| tree | b3d8923a5b09b5d87026a2a314bfa3d5d8658ac0 | |
| parent | a5605a120af69777dc86a6a114227230b93dc566 (diff) | |
| parent | f87ba994b3f49b808971fedfbb88cc741a08cda2 (diff) | |
Merge "defconfig: msm8916: enable Synaptics V2 driver in perf"
| -rw-r--r-- | arch/arm/configs/msm8916-512mb-perf_defconfig | 5 | ||||
| -rw-r--r-- | arch/arm/configs/msm8916-perf_defconfig | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm/configs/msm8916-512mb-perf_defconfig b/arch/arm/configs/msm8916-512mb-perf_defconfig index b9b9cb512dd..66d47646a6f 100644 --- a/arch/arm/configs/msm8916-512mb-perf_defconfig +++ b/arch/arm/configs/msm8916-512mb-perf_defconfig @@ -249,6 +249,11 @@ CONFIG_TOUCHSCREEN_GEN_VKEYS=y CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=y CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_RMI4_DEV=y CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_FW_UPDATE=y +CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_v21=y +CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_I2C_v21=y +CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_CORE_v21=y +CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_RMI_DEV_v21=y +CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_FW_UPDATE_v21=y CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=y CONFIG_INPUT_GPIO=m diff --git a/arch/arm/configs/msm8916-perf_defconfig b/arch/arm/configs/msm8916-perf_defconfig index 04b113cd147..da3c9eebe4e 100644 --- a/arch/arm/configs/msm8916-perf_defconfig +++ b/arch/arm/configs/msm8916-perf_defconfig @@ -251,6 +251,11 @@ CONFIG_TOUCHSCREEN_GEN_VKEYS=y CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=y CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_RMI4_DEV=y CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_FW_UPDATE=y +CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_v21=y +CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_I2C_v21=y +CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_CORE_v21=y +CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_RMI_DEV_v21=y +CONFIG_TOUCHSCREEN_SYNAPTICS_DSX_FW_UPDATE_v21=y CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=y CONFIG_INPUT_GPIO=m |