diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2014-01-29 15:43:28 +0100 |
|---|---|---|
| committer | Stefan Agner <stefan.agner@toradex.com> | 2014-01-29 15:43:28 +0100 |
| commit | 81465d86db70e169edb1dc59b0d6bc7a34cd13c7 (patch) | |
| tree | 516b1506980b7bcdd07f9d5a8a3880ccfd745fd7 /arch/arm/configs/colibri_t20_defconfig | |
| parent | 0a4e373dc430abd981b15d392098c9e32a134acd (diff) | |
| parent | 485b5d108fcf75a1066c5de054f8adf2e6118845 (diff) | |
Merge branch 'fusion-touchscreen' into colibri
Diffstat (limited to 'arch/arm/configs/colibri_t20_defconfig')
| -rw-r--r-- | arch/arm/configs/colibri_t20_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/colibri_t20_defconfig b/arch/arm/configs/colibri_t20_defconfig index 26892df10e9c..8fe150767638 100644 --- a/arch/arm/configs/colibri_t20_defconfig +++ b/arch/arm/configs/colibri_t20_defconfig @@ -196,6 +196,7 @@ CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_WM97XX=y # CONFIG_TOUCHSCREEN_WM9705 is not set # CONFIG_TOUCHSCREEN_WM9713 is not set +CONFIG_TOUCHSCREEN_FUSION_F0710A=m CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=y CONFIG_INPUT_GPIO=y |