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/usbhid | |
| parent | 5c891d5e094c15bd7791dc84749b5239257f5f2d (diff) | |
| parent | 9d14201c7444bbdf89413e88d91b73150c3de38b (diff) | |
| download | linux-de6c5070ad3956125fe8d407381c1b18f9749f93.tar.bz2 | |
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/usbhid')
| -rw-r--r-- | drivers/hid/usbhid/hid-core.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c index c008847e0b20..089bad8a9a21 100644 --- a/drivers/hid/usbhid/hid-core.c +++ b/drivers/hid/usbhid/hid-core.c @@ -1265,7 +1265,7 @@ static int usbhid_idle(struct hid_device *hid, int report, int idle, return hid_set_idle(dev, ifnum, report, idle); } -static struct hid_ll_driver usb_hid_driver = { +struct hid_ll_driver usb_hid_driver = { .parse = usbhid_parse, .start = usbhid_start, .stop = usbhid_stop, @@ -1278,6 +1278,7 @@ static struct hid_ll_driver usb_hid_driver = { .output_report = usbhid_output_report, .idle = usbhid_idle, }; +EXPORT_SYMBOL_GPL(usb_hid_driver); static int usbhid_probe(struct usb_interface *intf, const struct usb_device_id *id) { |