diff options
author | Jiri Kosina <jkosina@suse.cz> | 2011-10-25 07:59:04 (GMT) |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2011-10-25 07:59:04 (GMT) |
commit | b3aec7b686329e6bb65aa08c7f9458f7fd512f06 (patch) | |
tree | 67ae55567b5747f32ddd76dd63621bd2ca756a88 /include | |
parent | f6f12427844516bc8e9cf84f43aca7bbbaa48157 (diff) | |
parent | 1bcc20675a1ac1ba47eaa201e02a89b0508e17b2 (diff) | |
download | linux-fsl-qoriq-b3aec7b686329e6bb65aa08c7f9458f7fd512f06.tar.xz |
Merge branch 'upstream' into for-linus
Conflicts:
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/hid.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/hid.h b/include/linux/hid.h index 6fb743d..deed5f9 100644 --- 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 @@ -476,6 +477,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; |