Skip to content

Commit f6970d9

Browse files
committed
Merge remote-tracking branch 'remotes/origin/at91-4.14-trunk/defconfig' into linux-4.14-at91
2 parents cd57c3c + 130f792 commit f6970d9

1 file changed

Lines changed: 1 addition & 0 deletions

File tree

arch/arm/configs/sama5_defconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ CONFIG_KEYBOARD_GPIO=y
143143
# CONFIG_INPUT_MOUSE is not set
144144
CONFIG_INPUT_TOUCHSCREEN=y
145145
CONFIG_TOUCHSCREEN_ATMEL_MXT=y
146+
CONFIG_TOUCHSCREEN_ADC=y
146147
CONFIG_INPUT_MISC=y
147148
CONFIG_INPUT_ATMEL_PTC=m
148149
# CONFIG_SERIO is not set

0 commit comments

Comments
 (0)