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 1b3447460b644b896a36e4a3ed77920ed7b85d18..80175c37a6a5752c8480c54e497fd48217a429cf 100644 (file)
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -34,7 +34,7 @@ config HID
 config HID_BATTERY_STRENGTH
        bool
        depends on HID && POWER_SUPPLY && HID = POWER_SUPPLY
-       default y
+       default n
 
 config HIDRAW
        bool "/dev/hidraw raw HID device support"
@@ -60,6 +60,18 @@ source "drivers/hid/usbhid/Kconfig"
 menu "Special HID drivers"
        depends on HID
 
+config HID_GENERIC
+       tristate "Generic HID driver"
+       depends on HID
+       default y
+       ---help---
+       Support for generic HID devices.
+
+       To compile this driver as a module, choose M here: the module
+       will be called hid-generic.
+
+       If unsure, say Y.
+
 config HID_A4TECH
        tristate "A4 tech mice" if EXPERT
        depends on USB_HID