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

Whisker device specific fixes to hid-google driver

diff --combined drivers/hid/Kconfig
index 5a163f13663cf235fc080e57589570b808bf4cf7,68d2f773b52272fb7c5808c87984729f86caabf9..6d62e19f1a879b075f4c8bbc8dd4c9c87a608ca2
--- 1/drivers/hid/Kconfig
--- 2/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@@ -182,19 -182,6 +182,19 @@@ config HID_BETOP_F
        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
@@@ -364,7 -351,7 +364,7 @@@ config HOLTEK_F
  
  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.