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
This commit is contained in:
Jiri Kosina 2012-05-22 11:32:31 +02:00
commit 56ccd186f1
13 changed files with 307 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/linux/hid.h
View file

@ -896,7 +896,7 @@ static inline int hid_hw_power(struct hid_device *hdev, int level)
return hdev->ll_driver->power ? hdev->ll_driver->power(hdev, level) : 0;
}
void hid_report_raw_event(struct hid_device *hid, int type, u8 *data, int size,
int hid_report_raw_event(struct hid_device *hid, int type, u8 *data, int size,
int interrupt);
extern int hid_generic_init(void);