Merge branch 'for-4.20/microsoft' into for-linus

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

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index e5ec47705fa2bff1babdbe26d6644c1a32a1cbd3..18c846477ba2586f7ba6381aea515990d4c915a7 100644 (file)
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -182,6 +182,19 @@ config HID_BETOP_FF
        Currently the following devices are known to be supported:
         - BETOP 2185 PC & BFM MODE
 
+config HID_BIGBEN_FF
+       tristate "BigBen Interactive Kids' gamepad support"
+       depends on USB_HID
+       depends on NEW_LEDS
+       depends on LEDS_CLASS
+       select INPUT_FF_MEMLESS
+       default !EXPERT
+       help
+         Support for the "Kid-friendly Wired Controller" PS3OFMINIPAD
+         gamepad made by BigBen Interactive, originally sold as a PS3
+         accessory. This driver fixes input mapping and adds support for
+         force feedback effects and LEDs on the device.
+
 config HID_CHERRY
        tristate "Cherry Cymotion keyboard"
        depends on HID
@@ -351,7 +364,7 @@ config HOLTEK_FF
 
 config HID_GOOGLE_HAMMER
        tristate "Google Hammer Keyboard"
-       depends on USB_HID && LEDS_CLASS
+       depends on USB_HID && LEDS_CLASS && MFD_CROS_EC
        ---help---
        Say Y here if you have a Google Hammer device.