1 files changed, 25 insertions, 30 deletions

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index b7ec4057841d..67d2a7585934 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -55,12 +55,6 @@ source "drivers/hid/usbhid/Kconfig"
 menu "Special HID drivers"
         depends on HID
 
-config HID_3M_PCT
-        tristate "3M PCT touchscreen"
-        depends on USB_HID
-        ---help---
-        Support for 3M PCT touch screens.
-
 config HID_A4TECH
         tristate "A4 tech mice" if EXPERT
         depends on USB_HID
@@ -100,12 +94,6 @@ config HID_BELKIN
         ---help---
         Support for Belkin Flip KVM and Wireless keyboard.
 
-config HID_CANDO
-        tristate "Cando dual touch panel"
-        depends on USB_HID
-        ---help---
-        Support for Cando dual touch panel.
-
 config HID_CHERRY
         tristate "Cherry Cymotion keyboard" if EXPERT
         depends on USB_HID
@@ -185,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
@@ -300,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
@@ -320,13 +302,25 @@ config HID_MULTITOUCH
           Generic support for HID multitouch panels.
 
           Say Y here if you have one of the following devices:
+          - 3M PCT touch screens
+          - ActionStar dual touch panels
+          - 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 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.
 
@@ -340,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"
@@ -493,12 +494,6 @@ config HID_SONY
         ---help---
         Support for Sony PS3 controller.
 
-config HID_STANTUM
-        tristate "Stantum multitouch panel"
-        depends on USB_HID
-        ---help---
-        Support for Stantum multitouch panel.
-
 config HID_SUNPLUS
         tristate "Sunplus wireless desktop"
         depends on USB_HID