diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-10-23 16:49:32 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-10-23 16:49:32 -0400 |
| commit | 8b66a16f25f819bb1f132f075c5c01a288776cf8 (patch) | |
| tree | ff6e16818194aca66d8ea34f9765067b2a82020a /include | |
| parent | bbd128b5acae85b2ef346e95cc5a729ac5252f19 (diff) | |
| parent | 41fa92302be7fa37c5c38e17e2097d3e5e9da13a (diff) | |
Merge branch 'uc-logic' into for-linus
Conflicts:
drivers/hid/hid-ids.h
drivers/hid/hid-lg.c
drivers/hid/usbhid/hid-quirks.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/hid.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/hid.h b/include/linux/hid.h index 4cfe02c3fa4e..bb0f56f5c01e 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h | |||
| @@ -627,8 +627,8 @@ struct hid_driver { | |||
| 627 | int (*event)(struct hid_device *hdev, struct hid_field *field, | 627 | int (*event)(struct hid_device *hdev, struct hid_field *field, |
| 628 | struct hid_usage *usage, __s32 value); | 628 | struct hid_usage *usage, __s32 value); |
| 629 | 629 | ||
| 630 | void (*report_fixup)(struct hid_device *hdev, __u8 *buf, | 630 | __u8 *(*report_fixup)(struct hid_device *hdev, __u8 *buf, |
| 631 | unsigned int size); | 631 | unsigned int *size); |
| 632 | 632 | ||
| 633 | int (*input_mapping)(struct hid_device *hdev, | 633 | int (*input_mapping)(struct hid_device *hdev, |
| 634 | struct hid_input *hidinput, struct hid_field *field, | 634 | struct hid_input *hidinput, struct hid_field *field, |