openstlinux/linux-st
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'uc-logic' into for-linus

Browse Source 
Conflicts:
	drivers/hid/hid-ids.h
	drivers/hid/hid-lg.c
	drivers/hid/usbhid/hid-quirks.c
This commit is contained in:
Jiri Kosina
2010-10-23 22:49:32 +02:00
parent bbd128b5ac 41fa92302b
commit 8b66a16f25
23 changed files with 715 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/hid.h
View File

@ -627,8 +627,8 @@ struct hid_driver {
int (*event)(struct hid_device *hdev, struct hid_field *field,
struct hid_usage *usage, __s32 value);
void (*report_fixup)(struct hid_device *hdev, __u8 *buf,
unsigned int size);
__u8 *(*report_fixup)(struct hid_device *hdev, __u8 *buf,
unsigned int *size);
int (*input_mapping)(struct hid_device *hdev,
struct hid_input *hidinput, struct hid_field *field,