summaryrefslogtreecommitdiff
path: root/drivers/hid/Makefile
diff options
context:
space:
mode:
authorBenjamin Tissoires <benjamin.tissoires@gmail.com>2011-11-29 13:13:10 +0100
committerJiri Kosina <jkosina@suse.cz>2011-11-30 15:32:18 +0100
commit5e7ea11f603a0aeb77fd1bff0b242931ffe139de (patch)
tree212542059adf62ba0a9ebe2570de63021642cf64 /drivers/hid/Makefile
parent1b723e8dc81b23141bfb8991e002073b17fd0199 (diff)
downloadlinux-3.10-5e7ea11f603a0aeb77fd1bff0b242931ffe139de.tar.gz
linux-3.10-5e7ea11f603a0aeb77fd1bff0b242931ffe139de.tar.bz2
linux-3.10-5e7ea11f603a0aeb77fd1bff0b242931ffe139de.zip
HID: multitouch: merge quanta driver into hid-multitouch
This patch merge the last old-style hid multitouch driver to the generic one. It also adds 2 more quanta pids. Signed-off-by: Benjamin Tissoires <benjamin.tissoires@gmail.com> Acked-by: Henrik Rydberg <rydberg@euromail.se> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'drivers/hid/Makefile')
-rw-r--r--drivers/hid/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
index 1e0d2a638b2..032d59d7012 100644
--- a/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@ -51,7 +51,6 @@ obj-$(CONFIG_HID_MULTITOUCH) += hid-multitouch.o
obj-$(CONFIG_HID_NTRIG) += hid-ntrig.o
obj-$(CONFIG_HID_ORTEK) += hid-ortek.o
obj-$(CONFIG_HID_PRODIKEYS) += hid-prodikeys.o
-obj-$(CONFIG_HID_QUANTA) += hid-quanta.o
obj-$(CONFIG_HID_PANTHERLORD) += hid-pl.o
obj-$(CONFIG_HID_PETALYNX) += hid-petalynx.o
obj-$(CONFIG_HID_PICOLCD) += hid-picolcd.o