Merge pull request #1270 from MikeTuev/master
add TOUCHSCREEN_ADS7846 to both sunxi-next and sunxi-dev
This commit is contained in:
commit
90cd2391eb
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user