omap: i2c: add a timeout to the busy waiting

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

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index d3910c6..71d4c07 100644 (file)
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -31,21 +31,6 @@ config HID
 
          If unsure, say Y.
 
-config HID_DEBUG
-       bool "HID debugging support"
-       default y
-       depends on HID
-       ---help---
-       This option lets the HID layer output diagnostics about its internal
-       state, resolve HID usages, dump HID fields, etc. Individual HID drivers
-       use this debugging facility to output information about individual HID
-       devices, etc.
-
-       This feature is useful for those who are either debugging the HID parser
-       or any HID hardware device.
-
-       If unsure, say Y.
-
 config HIDRAW
        bool "/dev/hidraw raw HID device support"
        depends on HID
@@ -70,6 +55,12 @@ source "drivers/hid/usbhid/Kconfig"
 menu "Special HID drivers"
        depends on HID
 
+config HID_3M_PCT
+       tristate "3M PCT"
+       depends on USB_HID
+       ---help---
+       Support for 3M PCT touch screens.
+
 config HID_A4TECH
        tristate "A4 tech" if EMBEDDED
        depends on USB_HID
@@ -152,6 +143,13 @@ config HID_GYRATION
        ---help---
        Support for Gyration remote control.
 
+config HID_TWINHAN
+       tristate "Twinhan" if EMBEDDED
+       depends on USB_HID
+       default !EMBEDDED
+       ---help---
+       Support for Twinhan IR remote control.
+
 config HID_KENSINGTON
        tristate "Kensington" if EMBEDDED
        depends on USB_HID
@@ -191,6 +189,23 @@ config LOGIRUMBLEPAD2_FF
          Say Y here if you want to enable force feedback support for Logitech
          Rumblepad 2 devices.
 
+config LOGIG940_FF
+       bool "Logitech Flight System G940 force feedback support"
+       depends on HID_LOGITECH
+       select INPUT_FF_MEMLESS
+       help
+         Say Y here if you want to enable force feedback support for Logitech
+         Flight System G940 devices.
+
+config HID_MAGICMOUSE
+       tristate "Apple MagicMouse multi-touch support"
+       depends on BT_HIDP
+       ---help---
+       Support for the Apple Magic Mouse multi-touch.
+
+       Say Y here if you want support for the multi-touch features of the
+       Apple Wireless "Magic" Mouse.
+
 config HID_MICROSOFT
        tristate "Microsoft" if EMBEDDED
        depends on USB_HID
@@ -198,6 +213,12 @@ config HID_MICROSOFT
        ---help---
        Support for Microsoft devices that are not fully compliant with HID standard.
 
+config HID_MOSART
+       tristate "MosArt"
+       depends on USB_HID
+       ---help---
+       Support for MosArt dual-touch panels.
+
 config HID_MONTEREY
        tristate "Monterey" if EMBEDDED
        depends on USB_HID
@@ -206,18 +227,17 @@ config HID_MONTEREY
        Support for Monterey Genius KB29E.
 
 config HID_NTRIG
-       tristate "NTrig" if EMBEDDED
+       tristate "NTrig"
        depends on USB_HID
-       default !EMBEDDED
        ---help---
        Support for N-Trig touch screen.
 
-config HID_PANTHERLORD
-       tristate "Pantherlord devices support" if EMBEDDED
+config HID_ORTEK
+       tristate "Ortek" if EMBEDDED
        depends on USB_HID
        default !EMBEDDED
        ---help---
-       Support for PantherLord/GreenAsia based device support.
+       Support for Ortek WKB-2000 wireless keyboard + mouse trackpad.
 
 config HID_PANTHERLORD
        tristate "Pantherlord support" if EMBEDDED
@@ -242,6 +262,12 @@ config HID_PETALYNX
        ---help---
        Support for Petalynx Maxter remote control.
 
+config HID_QUANTA
+       tristate "Quanta Optical Touch"
+       depends on USB_HID
+       ---help---
+       Support for Quanta Optical Touch dual-touch panels.
+
 config HID_SAMSUNG
        tristate "Samsung" if EMBEDDED
        depends on USB_HID
@@ -256,6 +282,12 @@ config HID_SONY
        ---help---
        Support for Sony PS3 controller.
 
+config HID_STANTUM
+       tristate "Stantum"
+       depends on USB_HID
+       ---help---
+       Support for Stantum multitouch panel.
+
 config HID_SUNPLUS
        tristate "Sunplus" if EMBEDDED
        depends on USB_HID
@@ -315,14 +347,13 @@ config THRUSTMASTER_FF
        depends on HID_THRUSTMASTER
        select INPUT_FF_MEMLESS
        ---help---
-         Say Y here if you have a THRUSTMASTER FireStore Dual Power 2 or
-         a THRUSTMASTER Ferrari GT Rumble Force or Force Feedback Wheel and
-         want to enable force feedback support for it.
+         Say Y here if you have a THRUSTMASTER FireStore Dual Power 2 or 3,
+         a THRUSTMASTER Dual Trigger 3-in-1 or a THRUSTMASTER Ferrari GT
+         Rumble Force or Force Feedback Wheel.
 
 config HID_WACOM
-       tristate "Wacom Bluetooth devices support" if EMBEDDED
+       tristate "Wacom Bluetooth devices support"
        depends on BT_HIDP
-       default !EMBEDDED
        ---help---
        Support for Wacom Graphire Bluetooth tablet.