Merge pull request #1270 from MikeTuev/master

add TOUCHSCREEN_ADS7846 to both sunxi-next and sunxi-dev
This commit is contained in:
Martin Ayotte 2019-02-07 08:20:24 -05:00 committed by GitHub
commit 90cd2391eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

View File

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm 4.20.2 Kernel Configuration
# Linux/arm 4.20.6 Kernel Configuration
#
#
@ -2471,7 +2471,7 @@ CONFIG_MOUSE_SERIAL=m
# CONFIG_INPUT_TABLET is not set
CONFIG_INPUT_TOUCHSCREEN=y
CONFIG_TOUCHSCREEN_PROPERTIES=y
# CONFIG_TOUCHSCREEN_ADS7846 is not set
CONFIG_TOUCHSCREEN_ADS7846=m
# CONFIG_TOUCHSCREEN_AD7877 is not set
# CONFIG_TOUCHSCREEN_AD7879 is not set
CONFIG_TOUCHSCREEN_ADC=m

View File

@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Linux/arm 4.19.17 Kernel Configuration
# Linux/arm 4.19.19 Kernel Configuration
#
#
@ -2463,7 +2463,7 @@ CONFIG_MOUSE_SERIAL=m
# CONFIG_INPUT_TABLET is not set
CONFIG_INPUT_TOUCHSCREEN=y
CONFIG_TOUCHSCREEN_PROPERTIES=y
# CONFIG_TOUCHSCREEN_ADS7846 is not set
CONFIG_TOUCHSCREEN_ADS7846=m
# CONFIG_TOUCHSCREEN_AD7877 is not set
# CONFIG_TOUCHSCREEN_AD7879 is not set
CONFIG_TOUCHSCREEN_ADC=m