diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2017-09-05 11:14:10 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2017-09-05 11:14:10 +0200 |
| commit | de6c5070ad3956125fe8d407381c1b18f9749f93 (patch) | |
| tree | 2d75a35d43f1e1a5ac8793eab04d4b5886404dc6 /drivers/hid/Kconfig | |
| parent | 5c891d5e094c15bd7791dc84749b5239257f5f2d (diff) | |
| parent | 9d14201c7444bbdf89413e88d91b73150c3de38b (diff) | |
| download | op-kernel-dev-de6c5070ad3956125fe8d407381c1b18f9749f93.zip op-kernel-dev-de6c5070ad3956125fe8d407381c1b18f9749f93.tar.gz | |
Merge branch 'for-4.14/wacom' into for-linus
- name generation improvement for Wacom devices from Jason Gerecke
- Kconfig dependency fix for Wacom driver from Arnd Bergmann
Diffstat (limited to 'drivers/hid/Kconfig')
| -rw-r--r-- | drivers/hid/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index 3cd60f4..0a3117c 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -924,7 +924,7 @@ config HID_UDRAW_PS3 config HID_WACOM tristate "Wacom Intuos/Graphire tablet support (USB)" - depends on HID + depends on USB_HID select POWER_SUPPLY select NEW_LEDS select LEDS_CLASS |
