Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[pandora-kernel.git] / drivers / hid / Kconfig

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index d2a2751..24cca2f 100644 (file)
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -164,7 +164,8 @@ config HID_EGALAX
        tristate "eGalax multi-touch panel"
        depends on USB_HID
        ---help---
-       Support for the eGalax dual-touch panel.
+       Support for the eGalax dual-touch panels, including the
+       Joojoo and Wetab tablets.
 
 config HID_ELECOM
        tristate "ELECOM BM084 bluetooth mouse"
@@ -294,6 +295,23 @@ config HID_MONTEREY
        ---help---
        Support for Monterey Genius KB29E.
 
+config HID_MULTITOUCH
+       tristate "HID Multitouch panels"
+       depends on USB_HID
+       ---help---
+         Generic support for HID multitouch panels.
+
+         Say Y here if you have one of the following devices:
+         - Cypress TrueTouch panels
+         - Hanvon dual touch panels
+         - Pixcir dual touch panels
+         - 'Sensing Win7-TwoFinger' panel by GeneralTouch
+
+         If unsure, say N.
+
+         To compile this driver as a module, choose M here: the
+         module will be called hid-multitouch.
+
 config HID_NTRIG
        tristate "N-Trig touch screen"
        depends on USB_HID