Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

[sfrench/cifs-2.6.git] / drivers / hid / Kconfig

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index e85c8fe9ffcfd9df88f824503af6c105bebb048f..7e67dcb3d4f657d4bab800b8390b4af976b4554d 100644 (file)
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -29,11 +29,11 @@ config HID
 
          For docs and specs, see http://www.usb.org/developers/hidpage/
 
-         If unsure, say Y
+         If unsure, say Y.
 
 config HID_DEBUG
        bool "HID debugging support"
-       default y if !EMBEDDED
+       default y
        depends on HID
        ---help---
        This option lets the HID layer output diagnostics about its internal
@@ -44,7 +44,7 @@ config HID_DEBUG
        This feature is useful for those who are either debugging the HID parser
        or any HID hardware device.
 
-       If unsure, say N
+       If unsure, say Y.
 
 config HIDRAW
        bool "/dev/hidraw raw HID device support"
@@ -70,18 +70,6 @@ source "drivers/hid/usbhid/Kconfig"
 menu "Special HID drivers"
        depends on HID
 
-config HID_COMPAT
-       bool "Load all HID drivers on hid core load"
-       default y
-       ---help---
-       Compatible option for older userspace. If you have system without udev
-       support of module loading through aliases and also old
-       module-init-tools which can't handle hid bus, choose Y here. Otherwise
-       say N. If you say N and your userspace is old enough, the only
-       functionality you lose is modules autoloading.
-
-       If unsure, say Y.
-
 config HID_A4TECH
        tristate "A4 tech" if EMBEDDED
        depends on USB_HID
@@ -128,6 +116,14 @@ config HID_CYPRESS
        ---help---
        Support for cypress mouse and barcode readers.
 
+config DRAGONRISE_FF
+       tristate "DragonRise Inc. force feedback support"
+       depends on USB_HID
+       select INPUT_FF_MEMLESS
+       ---help---
+       Say Y here if you want to enable force feedback support for DragonRise Inc.
+       game controllers.
+
 config HID_EZKEY
        tristate "Ezkey" if EMBEDDED
        depends on USB_HID
@@ -135,6 +131,13 @@ config HID_EZKEY
        ---help---
        Support for Ezkey BTC 8193 keyboard.
 
+config HID_KYE
+       tristate "Kye" if EMBEDDED
+       depends on USB_HID
+       default !EMBEDDED
+       ---help---
+       Support for Kye/Genius Ergo Mouse.
+
 config HID_GYRATION
        tristate "Gyration" if EMBEDDED
        depends on USB_HID
@@ -142,6 +145,13 @@ config HID_GYRATION
        ---help---
        Support for Gyration remote control.
 
+config HID_KENSINGTON
+       tristate "Kensington" if EMBEDDED
+       depends on USB_HID
+       default !EMBEDDED
+       ---help---
+       Support for Kensington Slimblade Trackball.
+
 config HID_LOGITECH
        tristate "Logitech" if EMBEDDED
        depends on USB_HID
@@ -243,7 +253,7 @@ config GREENASIA_FF
        select INPUT_FF_MEMLESS
        ---help---
        Say Y here if you have a GreenAsia (Product ID 0x12) based game controller
-       (like MANTA Warior MM816 and SpeedLink Strike2 SL-6635) or adapter
+       (like MANTA Warrior MM816 and SpeedLink Strike2 SL-6635) or adapter
        and want to enable force feedback support for it.
 
 config HID_TOPSEED