Merge remote-tracking branch 'moduleh/module.h-split'

[karo-tx-linux.git] / include / linux / hid.h

diff --git a/include/linux/hid.h b/include/linux/hid.h
index 830632de7d2e22b5ea2fbb768caa60188898850f..0a06de0578760aa6768175dc4ee43c89964f5c4d 100644 (file)
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -71,6 +71,7 @@
 #include <linux/timer.h>
 #include <linux/workqueue.h>
 #include <linux/input.h>
+#include <linux/semaphore.h>
 
 /*
  * We parse each description item into this structure. Short items data
@@ -475,6 +476,7 @@ struct hid_device {                                                 /* device report descriptor */
        unsigned country;                                               /* HID country */
        struct hid_report_enum report_enum[HID_REPORT_TYPES];
 
+       struct semaphore driver_lock;                                   /* protects the current driver */
        struct device dev;                                              /* device */
        struct hid_driver *driver;
        struct hid_ll_driver *ll_driver;