diff options
| author | Benjamin Tissoires <benjamin.tissoires@enac.fr> | 2011-04-22 05:51:48 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-04-22 08:14:52 -0400 |
| commit | 4a6ee685fbcba4a440cf86f41557752ba81e2ccf (patch) | |
| tree | c3b1383b216c9b6adff73e2499d60c082e44f9aa /drivers/hid/Makefile | |
| parent | 6ab3a9a63fc16b04f7de48eb0190d516dd7574df (diff) | |
HID: hid-multitouch: merge hid-mosart into hid-multitouch
This patch include MosArt devices into hid-multitouch.
MosArt devices now support mt-protocol B.
We also need to introduce a new quirk for mosart devices to support
their contactID.
Signed-off-by: Benjamin Tissoires <benjamin.tissoires@enac.fr>
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 11c9f0b127e1..f8cc4ea7335a 100644 --- a/drivers/hid/Makefile +++ b/drivers/hid/Makefile | |||
| @@ -45,7 +45,6 @@ obj-$(CONFIG_HID_LOGITECH) += hid-logitech.o | |||
| 45 | obj-$(CONFIG_HID_MAGICMOUSE) += hid-magicmouse.o | 45 | obj-$(CONFIG_HID_MAGICMOUSE) += hid-magicmouse.o |
| 46 | obj-$(CONFIG_HID_MICROSOFT) += hid-microsoft.o | 46 | obj-$(CONFIG_HID_MICROSOFT) += hid-microsoft.o |
| 47 | obj-$(CONFIG_HID_MONTEREY) += hid-monterey.o | 47 | obj-$(CONFIG_HID_MONTEREY) += hid-monterey.o |
| 48 | obj-$(CONFIG_HID_MOSART) += hid-mosart.o | ||
| 49 | obj-$(CONFIG_HID_MULTITOUCH) += hid-multitouch.o | 48 | obj-$(CONFIG_HID_MULTITOUCH) += hid-multitouch.o |
| 50 | obj-$(CONFIG_HID_NTRIG) += hid-ntrig.o | 49 | obj-$(CONFIG_HID_NTRIG) += hid-ntrig.o |
| 51 | obj-$(CONFIG_HID_ORTEK) += hid-ortek.o | 50 | obj-$(CONFIG_HID_ORTEK) += hid-ortek.o |