Merge tag 'platform-drivers-x86-v4.20-1' of git://git.infradead.org/linux-platform...

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

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 18c846477ba2586f7ba6381aea515990d4c915a7..41e9935fc5849e0992e3103912fbe01a5af2a555 100644 (file)
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -149,6 +149,7 @@ config HID_APPLEIR
 config HID_ASUS
        tristate "Asus"
        depends on LEDS_CLASS
+       depends on ASUS_WMI || ASUS_WMI=n
        ---help---
        Support for Asus notebook built-in keyboard and touchpad via i2c, and
        the Asus Republic of Gamers laptop keyboard special keys.
@@ -188,7 +189,6 @@ config HID_BIGBEN_FF
        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