summaryrefslogtreecommitdiff
path: root/drivers/hid/Kconfig
diff options
context:
space:
mode:
authorBenjamin Tissoires <benjamin.tissoires@enac.fr>2011-04-22 11:51:48 +0200
committerJiri Kosina <jkosina@suse.cz>2011-04-22 14:14:52 +0200
commit4a6ee685fbcba4a440cf86f41557752ba81e2ccf (patch)
treec3b1383b216c9b6adff73e2499d60c082e44f9aa /drivers/hid/Kconfig
parent6ab3a9a63fc16b04f7de48eb0190d516dd7574df (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/Kconfig')
-rw-r--r--drivers/hid/Kconfig7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 8058cf1ba83c..d2d4e5f1911e 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -288,12 +288,6 @@ config HID_MICROSOFT
---help---
Support for Microsoft devices that are not fully compliant with HID standard.
-config HID_MOSART
- tristate "MosArt dual-touch panels"
- depends on USB_HID
- ---help---
- Support for MosArt dual-touch panels.
-
config HID_MONTEREY
tristate "Monterey Genius KB29E keyboard" if EXPERT
depends on USB_HID
@@ -313,6 +307,7 @@ config HID_MULTITOUCH
- Cypress TrueTouch panels
- Hanvon dual touch panels
- IrTouch Infrared USB panels
+ - MosArt dual-touch panels
- PenMount dual touch panels
- Pixcir dual touch panels
- 'Sensing Win7-TwoFinger' panel by GeneralTouch