Merge branches 'hyperv', 'multitouch', 'roccat', 'upstream', 'upstream-fixes', 'wacom...

[karo-tx-linux.git] / drivers / hid / Kconfig

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index ef111b4ae97c132045bb3a91fe503ccb4bd4fbdc..a421abdd1ab7968e696d91f8f1b10ca1ff6a31a2 100644 (file)
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -31,6 +31,11 @@ config HID
 
          If unsure, say Y.
 
+config HID_BATTERY_STRENGTH
+       bool
+       depends on HID && POWER_SUPPLY && HID = POWER_SUPPLY
+       default y
+
 config HIDRAW
        bool "/dev/hidraw raw HID device support"
        depends on HID
@@ -490,6 +495,13 @@ config HID_ROCCAT_ARVO
        ---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"
        depends on USB_HID
@@ -558,6 +570,12 @@ config GREENASIA_FF
        (like MANTA Warrior MM816 and SpeedLink Strike2 SL-6635) or adapter
        and want to enable force feedback support for it.
 
+config HID_HYPERV_MOUSE
+       tristate "Microsoft Hyper-V mouse driver"
+       depends on HYPERV
+       ---help---
+       Select this option to enable the Hyper-V mouse driver.
+
 config HID_SMARTJOYPLUS
        tristate "SmartJoy PLUS PS2/USB adapter support"
        depends on USB_HID
@@ -618,9 +636,19 @@ config HID_WIIMOTE
        depends on BT_HIDP
        depends on LEDS_CLASS
        select POWER_SUPPLY
+       select INPUT_FF_MEMLESS
        ---help---
        Support for the Nintendo Wii Remote bluetooth device.
 
+config HID_WIIMOTE_EXT
+       bool "Nintendo Wii Remote Extension support"
+       depends on HID_WIIMOTE
+       default HID_WIIMOTE
+       ---help---
+       Support for extension controllers of the Nintendo Wii Remote. Say yes
+       here if you want to use the Nintendo Motion+, Nunchuck or Classic
+       extension controllers with your Wii Remote.
+
 config HID_ZEROPLUS
        tristate "Zeroplus based game controller support"
        depends on USB_HID