summaryrefslogtreecommitdiff
path: root/include/linux/hid.h
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2012-05-22 11:32:31 +0200
committerJiri Kosina <jkosina@suse.cz>2012-05-22 11:32:31 +0200
commit56ccd186f1837dd418cd094f0e96b3196bbab9ef (patch)
tree195cdd3973a1288eb84f51f0ec28a947b333c2c5 /include/linux/hid.h
parentb3d07e0344ea36dd3f3a2fdbfaab883e1c5ca69e (diff)
parentd1257081aecf44455fcab8675f1d54e8b242faa1 (diff)
downloadlwn-56ccd186f1837dd418cd094f0e96b3196bbab9ef.tar.gz
lwn-56ccd186f1837dd418cd094f0e96b3196bbab9ef.zip
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.h2
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)
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);