forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'upstream' into for-linus

Browse source 
Conflicts:
	drivers/hid/hid-core.c
	drivers/hid/hid-ids.h
This commit is contained in:
Jiri Kosina 2011-10-25 09:59:04 +02:00
commit b3aec7b686
13 changed files with 278 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/linux/hid.h
View file

@ -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;