Merge branch 'upstream' into for-linus

[linux-2.6-block.git] / drivers / hid / Kconfig

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index a421abdd1ab7968e696d91f8f1b10ca1ff6a31a2..a3d033252995aeb388fbcabc1dab8a286e38cb51 100644 (file)
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -200,11 +200,14 @@ config HID_KEYTOUCH
                - Keytouch IEC 60945
 
 config HID_KYE
-       tristate "Kye/Genius Ergo Mouse" if EXPERT
+       tristate "KYE/Genius devices"
        depends on USB_HID
-       default !EXPERT
        ---help---
-       Support for Kye/Genius Ergo Mouse.
+       Support for KYE/Genius devices not fully compliant with HID standard:
+       - Ergo Mouse
+       - EasyPen i405X tablet
+       - MousePen i608X tablet
+       - EasyPen M610X tablet
 
 config HID_UCLOGIC
        tristate "UC-Logic"
@@ -257,7 +260,9 @@ config HID_LOGITECH_DJ
        ---help---
        Say Y if you want support for Logitech Unifying receivers and devices.
        Unifying receivers are capable of pairing up to 6 Logitech compliant
-       devices to the same receiver.
+       devices to the same receiver. Without this driver it will be handled by
+       generic USB_HID driver and all incomming events will be multiplexed
+       into a single mouse and a single keyboard device.
 
 config LOGITECH_FF
        bool "Logitech force feedback support"
@@ -354,7 +359,9 @@ config HID_MULTITOUCH
          - LG Display panels (Dell ST2220Tc)
          - Lumio CrystalTouch panels
          - MosArt dual-touch panels
+         - Panasonic multitouch panels
          - PenMount dual touch panels
+         - Perixx Peripad 701 touchpad
          - PixArt optical touch screen
          - Pixcir dual touch panels
          - Quanta panels
@@ -476,59 +483,21 @@ config HID_PRIMAX
        HID standard.
 
 config HID_ROCCAT
-       tristate "Roccat special event support"
-       depends on USB_HID
-       select HID_ROCCAT_COMMON
-       ---help---
-       Support for Roccat special events.
-       Say Y here if you have a Roccat mouse or keyboard and want OSD or
-       macro execution support.
-
-config HID_ROCCAT_COMMON
-       tristate
-       depends on HID_ROCCAT
-
-config HID_ROCCAT_ARVO
-       tristate "Roccat Arvo keyboard support"
-       depends on USB_HID
-       depends on HID_ROCCAT
-       ---help---
-       Support for Roccat Arvo keyboard.
-
-config HID_ROCCAT_ISKU
-       tristate "Roccat Isku keyboard support"
-       depends on USB_HID
-       depends on HID_ROCCAT
-       ---help---
-       Support for Roccat Isku keyboard.
-
-config HID_ROCCAT_KONE
-       tristate "Roccat Kone Mouse support"
+       tristate "Roccat device support"
        depends on USB_HID
-       depends on HID_ROCCAT
        ---help---
-       Support for Roccat Kone mouse.
+       Support for Roccat devices.
+       Say Y here if you have a Roccat mouse or keyboard and want
+       support for its special functionalities.
 
-config HID_ROCCAT_KONEPLUS
-       tristate "Roccat Kone[+] mouse support"
+config HID_SAITEK
+       tristate "Saitek non-fully HID-compliant devices"
        depends on USB_HID
-       depends on HID_ROCCAT
        ---help---
-       Support for Roccat Kone[+] mouse.
-
-config HID_ROCCAT_KOVAPLUS
-       tristate "Roccat Kova[+] mouse support"
-       depends on USB_HID
-       depends on HID_ROCCAT
-       ---help---
-       Support for Roccat Kova[+] mouse.
+       Support for Saitek devices that are not fully compliant with the
+       HID standard.
 
-config HID_ROCCAT_PYRA
-       tristate "Roccat Pyra mouse support"
-       depends on USB_HID
-       depends on HID_ROCCAT
-       ---help---
-       Support for Roccat Pyra mouse.
+       Currently only supports the PS1000 controller.
 
 config HID_SAMSUNG
        tristate "Samsung InfraRed remote control or keyboards"
@@ -594,6 +563,12 @@ config SMARTJOYPLUS_FF
        Say Y here if you have a SmartJoy PLUS PS2/USB adapter and want to
        enable force feedback support for it.
 
+config HID_TIVO
+       tristate "TiVo Slide Bluetooth remote control support"
+       depends on (USB_HID || BT_HIDP)
+       ---help---
+       Say Y if you have a TiVo Slide Bluetooth remote control.
+
 config HID_TOPSEED
        tristate "TopSeed Cyberlink, BTC Emprex, Conceptronic remote control support"
        depends on USB_HID