diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-11-13 11:56:45 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2015-11-13 11:56:45 -0800 |
| commit | bbdb5c22e12507e7f1637091bc24fe4d33e128e5 (patch) | |
| tree | b66d1f87c6659d6875b5b0bd6b71cbfe3bbe2285 /drivers/input/touchscreen/Makefile | |
| parent | HID: hid-gfrm: avoid warning for input_configured API change (diff) | |
| parent | Input: parkbd - drop bogus __init from parkbd_allocate_serio() (diff) | |
| download | linux-bbdb5c22e12507e7f1637091bc24fe4d33e128e5.tar.gz linux-bbdb5c22e12507e7f1637091bc24fe4d33e128e5.zip | |
Merge branch 'next' into for-linus
Prepare second round of input updates for 4.3 merge window.
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 17435c7e97e3..cbaa6abb08da 100644 --- a/drivers/input/touchscreen/Makefile +++ b/drivers/input/touchscreen/Makefile @@ -69,6 +69,8 @@ obj-$(CONFIG_TOUCHSCREEN_TOUCHIT213) += touchit213.o obj-$(CONFIG_TOUCHSCREEN_TOUCHRIGHT) += touchright.o obj-$(CONFIG_TOUCHSCREEN_TOUCHWIN) += touchwin.o 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 obj-$(CONFIG_TOUCHSCREEN_TSC2007) += tsc2007.o obj-$(CONFIG_TOUCHSCREEN_UCB1400) += ucb1400_ts.o |