diff options
| author | Troy Kisky <troy.kisky@boundarydevices.com> | 2012-07-03 17:04:57 -0700 |
|---|---|---|
| committer | Troy Kisky <troy.kisky@boundarydevices.com> | 2012-07-03 17:04:57 -0700 |
| commit | 2f0c84b3619deaaebeb3daa0166bed54bfdac190 (patch) | |
| tree | 121ecf51a8d628f9f9af642f859dcf8956a2d508 /arch/arm/configs/nitrogen6x_defconfig | |
| parent | bfecaa2c2dc7583a42523c2ab136d21a97887289 (diff) | |
| parent | e06baef465e2ee37e286b264182d4a23f8f2c067 (diff) | |
Merge branch 'boundary-L3.0.15_12.04.01' of github.com:boundarydevices/linux-imx6 into boundary-L3.0.15_12.04.013.0-boundary-imx6-201207031704
Diffstat (limited to 'arch/arm/configs/nitrogen6x_defconfig')
| -rw-r--r-- | arch/arm/configs/nitrogen6x_defconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/configs/nitrogen6x_defconfig b/arch/arm/configs/nitrogen6x_defconfig index 0c3b5151b863..f387d81f50ec 100644 --- a/arch/arm/configs/nitrogen6x_defconfig +++ b/arch/arm/configs/nitrogen6x_defconfig @@ -1078,6 +1078,7 @@ CONFIG_INPUT_TOUCHSCREEN=y # CONFIG_TOUCHSCREEN_HAMPSHIRE is not set # CONFIG_TOUCHSCREEN_EETI is not set CONFIG_TOUCHSCREEN_EGALAX=y +CONFIG_TOUCHSCREEN_EGALAX_SINGLE_TOUCH=y # CONFIG_TOUCHSCREEN_FUJITSU is not set # CONFIG_TOUCHSCREEN_GUNZE is not set # CONFIG_TOUCHSCREEN_ELO is not set @@ -1100,6 +1101,8 @@ CONFIG_TOUCHSCREEN_TSC2004=y # CONFIG_TOUCHSCREEN_ST1232 is not set # CONFIG_TOUCHSCREEN_P1003 is not set # CONFIG_TOUCHSCREEN_TPS6507X is not set +CONFIG_TOUCHSCREEN_FT5X06=y +CONFIG_TOUCHSCREEN_FT5X06_SINGLE_TOUCH=y CONFIG_INPUT_MISC=y # CONFIG_INPUT_AD714X is not set # CONFIG_INPUT_ATI_REMOTE is not set |