diff options
author | Dmitry Torokhov | 2011-01-07 07:34:59 +0100 |
---|---|---|
committer | Dmitry Torokhov | 2011-01-07 07:34:59 +0100 |
commit | 554738da71004d96e06fb75f4772dfc3b0f47810 (patch) | |
tree | 149a96ce3727025d3b9260961ec94ba8306db278 /drivers/input/touchscreen/Makefile | |
parent | Input: wacom - add support for digitizer in Lenovo W700 (diff) | |
parent | Input: wacom_w8001 - support pen or touch only devices (diff) | |
download | kernel-qcow2-linux-554738da71004d96e06fb75f4772dfc3b0f47810.tar.gz kernel-qcow2-linux-554738da71004d96e06fb75f4772dfc3b0f47810.tar.xz kernel-qcow2-linux-554738da71004d96e06fb75f4772dfc3b0f47810.zip |
Merge branch 'next' into for-linus
Conflicts:
include/linux/input.h
Diffstat (limited to 'drivers/input/touchscreen/Makefile')
-rw-r--r-- | drivers/input/touchscreen/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile index 7cc1b4f4b677..718bcc814952 100644 --- a/drivers/input/touchscreen/Makefile +++ b/drivers/input/touchscreen/Makefile @@ -39,6 +39,7 @@ obj-$(CONFIG_TOUCHSCREEN_PCAP) += pcap_ts.o obj-$(CONFIG_TOUCHSCREEN_PENMOUNT) += penmount.o obj-$(CONFIG_TOUCHSCREEN_QT602240) += qt602240_ts.o obj-$(CONFIG_TOUCHSCREEN_S3C2410) += s3c2410_ts.o +obj-$(CONFIG_TOUCHSCREEN_ST1232) += st1232.o obj-$(CONFIG_TOUCHSCREEN_STMPE) += stmpe-ts.o obj-$(CONFIG_TOUCHSCREEN_TNETV107X) += tnetv107x-ts.o obj-$(CONFIG_TOUCHSCREEN_TOUCHIT213) += touchit213.o |