1 files changed, 93 insertions, 2 deletions

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 26c6f10afcb8..339c1eaa55ac 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -86,6 +86,12 @@ 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" if EMBEDDED
         depends on USB_HID
@@ -137,6 +143,12 @@ config DRAGONRISE_FF
         Say Y here if you want to enable force feedback support for DragonRise Inc.
         game controllers.
 
+config HID_EGALAX
+        tristate "eGalax multi-touch panel"
+        depends on USB_HID
+        ---help---
+        Support for the eGalax dual-touch panel
+
 config HID_EZKEY
         tristate "Ezkey" if EMBEDDED
         depends on USB_HID
@@ -277,18 +289,82 @@ config HID_PETALYNX
         ---help---
         Support for Petalynx Maxter remote control.
 
+config HID_PICOLCD
+        tristate "PicoLCD (graphic version)"
+        depends on USB_HID
+        ---help---
+          This provides support for Minibox PicoLCD devices, currently
+          only the graphical ones are supported.
+
+          This includes support for the following device features:
+          - Keypad
+          - Switching between Firmware and Flash mode
+          - EEProm / Flash access     (via debugfs)
+          Features selectively enabled:
+          - Framebuffer for monochrome 256x64 display
+          - Backlight control
+          - Contrast control
+          - General purpose outputs
+          Features that are not (yet) supported:
+          - IR
+
+config HID_PICOLCD_FB
+        bool "Framebuffer support" if EMBEDDED
+        default !EMBEDDED
+        depends on HID_PICOLCD
+        depends on HID_PICOLCD=FB || FB=y
+        select FB_DEFERRED_IO
+        select FB_SYS_FILLRECT
+        select FB_SYS_COPYAREA
+        select FB_SYS_IMAGEBLIT
+        select FB_SYS_FOPS
+        ---help---
+          Provide access to PicoLCD's 256x64 monochrome display via a
+          frambuffer device.
+
+config HID_PICOLCD_BACKLIGHT
+        bool "Backlight control" if EMBEDDED
+        default !EMBEDDED
+        depends on HID_PICOLCD
+        depends on HID_PICOLCD=BACKLIGHT_CLASS_DEVICE || BACKLIGHT_CLASS_DEVICE=y
+        ---help---
+          Provide access to PicoLCD's backlight control via backlight
+          class.
+
+config HID_PICOLCD_LCD
+        bool "Contrast control" if EMBEDDED
+        default !EMBEDDED
+        depends on HID_PICOLCD
+        depends on HID_PICOLCD=LCD_CLASS_DEVICE || LCD_CLASS_DEVICE=y
+        ---help---
+          Provide access to PicoLCD's LCD contrast via lcd class.
+
+config HID_PICOLCD_LEDS
+        bool "GPO via leds class" if EMBEDDED
+        default !EMBEDDED
+        depends on HID_PICOLCD
+        depends on HID_PICOLCD=LEDS_CLASS || LEDS_CLASS=y
+        ---help---
+          Provide access to PicoLCD's GPO pins via leds class.
+
 config HID_QUANTA
         tristate "Quanta Optical Touch"
         depends on USB_HID
         ---help---
         Support for Quanta Optical Touch dual-touch panels.
 
+config HID_ROCCAT_KONE
+        tristate "Roccat Kone Mouse support"
+        depends on USB_HID
+        ---help---
+        Support for Roccat Kone mouse.
+
 config HID_SAMSUNG
         tristate "Samsung" if EMBEDDED
         depends on USB_HID
         default !EMBEDDED
         ---help---
-        Support for Samsung InfraRed remote control.
+        Support for Samsung InfraRed remote control or keyboards.
 
 config HID_SONY
         tristate "Sony" if EMBEDDED
@@ -347,7 +423,7 @@ config HID_TOPSEED
         depends on USB_HID
         default !EMBEDDED
         ---help---
-        Say Y if you have a TopSeed Cyberlink remote control.
+        Say Y if you have a TopSeed Cyberlink or BTC Emprex remote control.
 
 config HID_THRUSTMASTER
         tristate "ThrustMaster devices support" if EMBEDDED
@@ -372,6 +448,14 @@ config HID_WACOM
         ---help---
         Support for Wacom Graphire Bluetooth tablet.
 
+config HID_WACOM_POWER_SUPPLY
+        bool "Wacom Bluetooth devices power supply status support"
+        depends on HID_WACOM
+        select POWER_SUPPLY
+        ---help---
+          Say Y here if you want to enable power supply status monitoring for
+          Wacom Bluetooth devices.
+
 config HID_ZEROPLUS
         tristate "Zeroplus based game controller support" if EMBEDDED
         depends on USB_HID
@@ -387,6 +471,13 @@ config ZEROPLUS_FF
           Say Y here if you have a Zeroplus based game controller and want
           to have force feedback support for it.
 
+config HID_ZYDACRON
+        tristate "Zydacron remote control support" if EMBEDDED
+        depends on USB_HID
+        default !EMBEDDED
+        ---help---
+        Support for Zydacron remote control.
+
 endmenu
 
 endif # HID_SUPPORT