git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-4.20/google' into for-linus
[sfrench/cifs-2.6.git]
/
drivers
/
hid
/
Kconfig
diff --git
a/drivers/hid/Kconfig
b/drivers/hid/Kconfig
index 5a163f13663cf235fc080e57589570b808bf4cf7..6d62e19f1a879b075f4c8bbc8dd4c9c87a608ca2 100644
(file)
--- a/
drivers/hid/Kconfig
+++ b/
drivers/hid/Kconfig
@@
-364,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.