summaryrefslogtreecommitdiffstats
path: root/drivers/input/touchscreen/Makefile
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2019-01-13 22:35:32 -0800
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2019-01-13 22:35:32 -0800
commit4116941b7a703f8c770998bb3a59966608cb5bb2 (patch)
tree32945b644b69e3fd1a9ba8cd7369cf62abc44ccd /drivers/input/touchscreen/Makefile
parente85bb0beb6498c0dffe18a2f1f16d575bc175c32 (diff)
parent8fe28cb58bcb235034b64cbbb7550a8a43fd88be (diff)
downloadlinux-4116941b7a703f8c770998bb3a59966608cb5bb2.tar.bz2
Merge tag 'v4.20' into next
Merge with mainline to bring in the new APIs.
Diffstat (limited to 'drivers/input/touchscreen/Makefile')
-rw-r--r--drivers/input/touchscreen/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile
index aca7cb04910b..fcc7605fba8d 100644
--- a/drivers/input/touchscreen/Makefile
+++ b/drivers/input/touchscreen/Makefile
@@ -13,6 +13,7 @@ obj-$(CONFIG_TOUCHSCREEN_AD7877) += ad7877.o
obj-$(CONFIG_TOUCHSCREEN_AD7879) += ad7879.o
obj-$(CONFIG_TOUCHSCREEN_AD7879_I2C) += ad7879-i2c.o
obj-$(CONFIG_TOUCHSCREEN_AD7879_SPI) += ad7879-spi.o
+obj-$(CONFIG_TOUCHSCREEN_ADC) += resistive-adc-touch.o
obj-$(CONFIG_TOUCHSCREEN_ADS7846) += ads7846.o
obj-$(CONFIG_TOUCHSCREEN_AR1021_I2C) += ar1021_i2c.o
obj-$(CONFIG_TOUCHSCREEN_ATMEL_MXT) += atmel_mxt_ts.o