diff options
| author | Eric Nelson <eric.nelson@boundarydevices.com> | 2013-03-03 08:15:15 -0700 |
|---|---|---|
| committer | Eric Nelson <eric.nelson@boundarydevices.com> | 2013-03-03 08:15:15 -0700 |
| commit | 7cc842cda7cdc90331d6f78573da8a03315ac0ca (patch) | |
| tree | 090c99002029bc2d18a5a3ffb8a9dca898b81702 | |
| parent | 250d1ea40b08689ca99d6d63cc260c2c059ef6f9 (diff) | |
| parent | b9f44ed5c8565c0e65349e938912b6b6ec70fa27 (diff) | |
Merge branch 'boundary-imx_3.0.35_1.1.1' of github.com:boundarydevices/linux-imx6 into boundary-imx_3.0.35_1.1.1
| -rw-r--r-- | arch/arm/configs/nitrogen6x_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/nitrogen6x_defconfig b/arch/arm/configs/nitrogen6x_defconfig index dfb067c5c3a4..cf86a1983661 100644 --- a/arch/arm/configs/nitrogen6x_defconfig +++ b/arch/arm/configs/nitrogen6x_defconfig @@ -1259,7 +1259,7 @@ CONFIG_INPUT_TOUCHSCREEN=y # CONFIG_TOUCHSCREEN_EETI is not set CONFIG_TOUCHSCREEN_EGALAX=y # CONFIG_TOUCHSCREEN_ELAN is not set -# CONFIG_TOUCHSCREEN_EGALAX_SINGLE_TOUCH is not set +CONFIG_TOUCHSCREEN_EGALAX_SINGLE_TOUCH=y # CONFIG_TOUCHSCREEN_FUJITSU is not set # CONFIG_TOUCHSCREEN_GUNZE is not set # CONFIG_TOUCHSCREEN_ELO is not set |