diff options
| author | mattis fjallstrom <mattis@acm.org> | 2014-12-02 11:13:21 -0800 |
|---|---|---|
| committer | mattis fjallstrom <mattis@acm.org> | 2014-12-02 11:13:21 -0800 |
| commit | b2de5771de6ed2daa89f9ae69deed21054791721 (patch) | |
| tree | 411afe8a36b32adca2c6b8ebc8bd4499412e6dea | |
| parent | 85df0a9425e5872f99eb3f791bcdc4e1c376ea06 (diff) | |
| parent | d01482e4e058d45918dd00bfb7549473da1498a2 (diff) | |
| download | olio-linux-3.10-b2de5771de6ed2daa89f9ae69deed21054791721.tar.xz olio-linux-3.10-b2de5771de6ed2daa89f9ae69deed21054791721.zip | |
Merge branch 'android-3.10-bringup' of ssh://internal.oliodevices.com:29418/kernel/omap into android-3.10-bringup
| -rw-r--r-- | arch/arm/configs/omap3_h1_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/omap3_h1_defconfig b/arch/arm/configs/omap3_h1_defconfig index 19e18ba20a1..3c291309575 100644 --- a/arch/arm/configs/omap3_h1_defconfig +++ b/arch/arm/configs/omap3_h1_defconfig @@ -1289,7 +1289,7 @@ CONFIG_TOUCHSCREEN_ATMXT=y # CONFIG_TOUCHSCREEN_ADS7846 is not set # CONFIG_TOUCHSCREEN_AD7877 is not set # CONFIG_TOUCHSCREEN_AD7879 is not set -# CONFIG_TOUCHSCREEN_ATMEL_MXT is not set +CONFIG_TOUCHSCREEN_ATMEL_MXT=y # CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set # CONFIG_TOUCHSCREEN_BU21013 is not set # CONFIG_TOUCHSCREEN_CY8CTMG110 is not set |