Merge branches 'doc', 'multitouch', 'upstream' and 'upstream-fixes' into for-linus

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

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 3e14815..67d2a75 100644 (file)
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -173,7 +173,7 @@ config HID_EZKEY
        Support for Ezkey BTC 8193 keyboard.
 
 config HID_KEYTOUCH
-       tristate "Keyoutch HID devices"
+       tristate "Keytouch HID devices"
        depends on USB_HID
        ---help---
        Support for Keytouch HID devices not fully compliant with
@@ -304,21 +304,23 @@ config HID_MULTITOUCH
          Say Y here if you have one of the following devices:
          - 3M PCT touch screens
          - ActionStar dual touch panels
-         - Cando dual touch panel
+         - Cando dual touch panels
          - CVTouch panels
          - Cypress TrueTouch panels
          - Elo TouchSystems IntelliTouch Plus panels
+         - GeneralTouch 'Sensing Win7-TwoFinger' panels
+         - GoodTouch panels
          - Hanvon dual touch panels
-         - Ilitek dual touch panel
+         - Ilitek dual touch panels
          - IrTouch Infrared USB panels
          - Lumio CrystalTouch panels
          - MosArt dual-touch panels
          - PenMount dual touch panels
          - Pixcir dual touch panels
-         - 'Sensing Win7-TwoFinger' panel by GeneralTouch
-          - eGalax dual-touch panels, including the
-           Joojoo and Wetab tablets
+         - eGalax dual-touch panels, including the Joojoo and Wetab tablets
          - Stantum multitouch panels
+         - Touch International Panels
+         - Unitec Panels
 
          If unsure, say N.
 
@@ -332,10 +334,17 @@ config HID_NTRIG
        Support for N-Trig touch screen.
 
 config HID_ORTEK
-       tristate "Ortek PKB-1700/WKB-2000 wireless keyboard and mouse trackpad"
+       tristate "Ortek PKB-1700/WKB-2000/Skycable wireless keyboard and mouse trackpad"
        depends on USB_HID
        ---help---
-       Support for Ortek PKB-1700/WKB-2000 wireless keyboard + mouse trackpad.
+       There are certain devices which have LogicalMaximum wrong in the keyboard
+       usage page of their report descriptor. The most prevailing ones so far
+       are manufactured by Ortek, thus the name of the driver. Currently
+       supported devices by this driver are
+
+          - Ortek PKB-1700
+          - Ortek WKB-2000
+          - Skycable wireless presenter
 
 config HID_PANTHERLORD
        tristate "Pantherlord/GreenAsia game controller"