diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-05-22 05:32:31 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-05-22 05:32:31 -0400 |
| commit | 56ccd186f1837dd418cd094f0e96b3196bbab9ef (patch) | |
| tree | 195cdd3973a1288eb84f51f0ec28a947b333c2c5 /include/linux/hid.h | |
| parent | b3d07e0344ea36dd3f3a2fdbfaab883e1c5ca69e (diff) | |
| parent | d1257081aecf44455fcab8675f1d54e8b242faa1 (diff) | |
Merge branch 'upstream' into for-linus
Conflicts:
drivers/hid/hid-core.c
Diffstat (limited to 'include/linux/hid.h')
| -rw-r--r-- | include/linux/hid.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/hid.h b/include/linux/hid.h index 2c7a19515c3a..449fa385703d 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h | |||
| @@ -896,7 +896,7 @@ static inline int hid_hw_power(struct hid_device *hdev, int level) | |||
| 896 | return hdev->ll_driver->power ? hdev->ll_driver->power(hdev, level) : 0; | 896 | return hdev->ll_driver->power ? hdev->ll_driver->power(hdev, level) : 0; |
| 897 | } | 897 | } |
| 898 | 898 | ||
| 899 | void hid_report_raw_event(struct hid_device *hid, int type, u8 *data, int size, | 899 | int hid_report_raw_event(struct hid_device *hid, int type, u8 *data, int size, |
| 900 | int interrupt); | 900 | int interrupt); |
| 901 | 901 | ||
| 902 | extern int hid_generic_init(void); | 902 | extern int hid_generic_init(void); |