Merge branches 'ntrig', 'picolcd', 'prodikeys' and 'roccat-kone' into for-linus

[safe/jmp/linux-2.6] / drivers / hid / Kconfig

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 0e8aa63..339c1ea 100644 (file)
--- 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
@@ -100,6 +106,21 @@ config HID_CHICONY
        ---help---
        Support for Chicony Tactical pad.
 
+config HID_PRODIKEYS
+       tristate "Prodikeys PC-MIDI Keyboard support"
+       depends on USB_HID && SND
+       select SND_RAWMIDI
+       ---help---
+       Support for Prodikeys PC-MIDI Keyboard device support.
+       Say Y here to enable support for this device.
+       - Prodikeys PC-MIDI keyboard.
+         The Prodikeys PC-MIDI acts as a USB Audio device, with one MIDI
+         input and one MIDI output. These MIDI jacks appear as
+         a sound "card" in the ALSA sound system.
+         Note: if you say N here, this device will still function as a basic
+         multimedia keyboard, but will lack support for the musical keyboard
+         and some additional multimedia keys.
+
 config HID_CYPRESS
        tristate "Cypress" if EMBEDDED
        depends on USB_HID
@@ -122,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
@@ -326,12 +353,18 @@ config HID_QUANTA
        ---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
@@ -390,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
@@ -415,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
@@ -430,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