HID: hid-multitouch: merge hid-mosart into hid-multitouch
authorBenjamin Tissoires <benjamin.tissoires@enac.fr>
Fri, 22 Apr 2011 09:51:48 +0000 (11:51 +0200)
committerJiri Kosina <jkosina@suse.cz>
Fri, 22 Apr 2011 12:14:52 +0000 (14:14 +0200)
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>
drivers/hid/Kconfig
drivers/hid/Makefile
drivers/hid/hid-mosart.c [deleted file]
drivers/hid/hid-multitouch.c

Simple merge
Simple merge
diff --cc drivers/hid/hid-mosart.c
Simple merge
Simple merge