diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-02-23 09:22:10 -0800 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2017-02-23 09:22:10 -0800 |
commit | a685f48cf6bc88d3902cd051838558079eaf02a0 (patch) | |
tree | 7cf8eb6cb30e07b8a975845f2131197460a592d5 /drivers/input/touchscreen/Makefile | |
parent | Input: tca8418_keypad - remove double read of key event register (diff) | |
parent | Input: tsc2007 - correctly report pressure and not resistance to user space (diff) | |
download | linux-dev-a685f48cf6bc88d3902cd051838558079eaf02a0.tar.xz linux-dev-a685f48cf6bc88d3902cd051838558079eaf02a0.zip |
Merge branch 'tsc2007' into next
Bring in TSC2007 improvements.
Diffstat (limited to 'drivers/input/touchscreen/Makefile')
-rw-r--r-- | drivers/input/touchscreen/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile index b622e5344137..ad5c896222bc 100644 --- a/drivers/input/touchscreen/Makefile +++ b/drivers/input/touchscreen/Makefile @@ -79,6 +79,8 @@ obj-$(CONFIG_TOUCHSCREEN_TSC_SERIO) += tsc40.o obj-$(CONFIG_TOUCHSCREEN_TSC200X_CORE) += tsc200x-core.o obj-$(CONFIG_TOUCHSCREEN_TSC2004) += tsc2004.o obj-$(CONFIG_TOUCHSCREEN_TSC2005) += tsc2005.o +tsc2007-y := tsc2007_core.o +tsc2007-$(CONFIG_TOUCHSCREEN_TSC2007_IIO) += tsc2007_iio.o obj-$(CONFIG_TOUCHSCREEN_TSC2007) += tsc2007.o obj-$(CONFIG_TOUCHSCREEN_UCB1400) += ucb1400_ts.o obj-$(CONFIG_TOUCHSCREEN_WACOM_W8001) += wacom_w8001.o |