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

1 files changed, 11 insertions, 0 deletions

diff --git a/include/linux/hid.h b/include/linux/hid.h
index 26759920aa8f..08ab9864d81e 100644
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -780,6 +780,17 @@ struct hid_ll_driver {
         int (*idle)(struct hid_device *hdev, int report, int idle, int reqtype);
 };
 
+extern struct hid_ll_driver i2c_hid_ll_driver;
+extern struct hid_ll_driver hidp_hid_driver;
+extern struct hid_ll_driver uhid_hid_driver;
+extern struct hid_ll_driver usb_hid_driver;
+
+static inline bool hid_is_using_ll_driver(struct hid_device *hdev,
+                struct hid_ll_driver *driver)
+{
+        return hdev->ll_driver == driver;
+}
+
 #define PM_HINT_FULLON  1<<5
 #define PM_HINT_NORMAL  1<<1