diff options
| author | Benjamin Tissoires <benjamin.tissoires@gmail.com> | 2011-11-29 07:13:10 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-11-30 09:32:18 -0500 |
| commit | 5e7ea11f603a0aeb77fd1bff0b242931ffe139de (patch) | |
| tree | 212542059adf62ba0a9ebe2570de63021642cf64 /drivers/hid/Makefile | |
| parent | 1b723e8dc81b23141bfb8991e002073b17fd0199 (diff) | |
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/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile index 1e0d2a638b28..032d59d70127 100644 --- a/drivers/hid/Makefile +++ b/drivers/hid/Makefile | |||
| @@ -51,7 +51,6 @@ obj-$(CONFIG_HID_MULTITOUCH) += hid-multitouch.o | |||
| 51 | obj-$(CONFIG_HID_NTRIG) += hid-ntrig.o | 51 | obj-$(CONFIG_HID_NTRIG) += hid-ntrig.o |
| 52 | obj-$(CONFIG_HID_ORTEK) += hid-ortek.o | 52 | obj-$(CONFIG_HID_ORTEK) += hid-ortek.o |
| 53 | obj-$(CONFIG_HID_PRODIKEYS) += hid-prodikeys.o | 53 | obj-$(CONFIG_HID_PRODIKEYS) += hid-prodikeys.o |
| 54 | obj-$(CONFIG_HID_QUANTA) += hid-quanta.o | ||
| 55 | obj-$(CONFIG_HID_PANTHERLORD) += hid-pl.o | 54 | obj-$(CONFIG_HID_PANTHERLORD) += hid-pl.o |
| 56 | obj-$(CONFIG_HID_PETALYNX) += hid-petalynx.o | 55 | obj-$(CONFIG_HID_PETALYNX) += hid-petalynx.o |
| 57 | obj-$(CONFIG_HID_PICOLCD) += hid-picolcd.o | 56 | obj-$(CONFIG_HID_PICOLCD) += hid-picolcd.o |