diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-09-20 11:46:40 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-09-20 11:46:40 +1000 |
| commit | e37739fcb3a2d081a1613ae0aec74af7442c9c6a (patch) | |
| tree | 2b98b459ad93347112501b002110914cbb8b70d6 /include | |
| parent | 891de9fc9888a6cfbba90f7ef767a90c53087772 (diff) | |
| parent | d2fabbe4d9deb68cb6e49be627b323d38d7b2064 (diff) | |
Merge remote branch 'hid/for-next'
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 42a0f1d11365..0a34fb071379 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -626,8 +626,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, |