summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2017-09-05 11:14:10 +0200
committerJiri Kosina <jkosina@suse.cz>2017-09-05 11:14:10 +0200
commitde6c5070ad3956125fe8d407381c1b18f9749f93 (patch)
tree2d75a35d43f1e1a5ac8793eab04d4b5886404dc6 /net
parent5c891d5e094c15bd7791dc84749b5239257f5f2d (diff)
parent9d14201c7444bbdf89413e88d91b73150c3de38b (diff)
downloadlinux-stable-de6c5070ad3956125fe8d407381c1b18f9749f93.tar.gz
linux-stable-de6c5070ad3956125fe8d407381c1b18f9749f93.tar.bz2
linux-stable-de6c5070ad3956125fe8d407381c1b18f9749f93.zip
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 'net')
-rw-r--r--net/bluetooth/hidp/core.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c
index 002743ea509c..8112893037bd 100644
--- a/net/bluetooth/hidp/core.c
+++ b/net/bluetooth/hidp/core.c
@@ -734,7 +734,7 @@ static void hidp_stop(struct hid_device *hid)
hid->claimed = 0;
}
-static struct hid_ll_driver hidp_hid_driver = {
+struct hid_ll_driver hidp_hid_driver = {
.parse = hidp_parse,
.start = hidp_start,
.stop = hidp_stop,
@@ -743,6 +743,7 @@ static struct hid_ll_driver hidp_hid_driver = {
.raw_request = hidp_raw_request,
.output_report = hidp_output_report,
};
+EXPORT_SYMBOL_GPL(hidp_hid_driver);
/* This function sets up the hid device. It does not add it
to the HID system. That is done in hidp_add_connection(). */