History

Merge branch 'upstream' into for-linus

Jiri Kosina committed 14 years ago

Commit 56ccd182 parents b3d07e0 d12570813 files · +307 −32Browse files

Showing the changes to include (2 of 13 files). Show all

Unified · Split

2 files
  1. include/linux/hid.h +1 −1
  2. include/linux/hidraw.h +2 −2
include/linux/hid.h+1−1
@@ -896,7 +896,7 @@ static inline int hid_hw_power(struct hid_device *hdev, int level) · 895 unmodified lines
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
899void hid_report_raw_event(struct hid_device *hid, int type, u8 *data, int size,899int hid_report_raw_event(struct hid_device *hid, int type, u8 *data, int size,
900 int interrupt);900 int interrupt);
901 901
902extern int hid_generic_init(void);902extern int hid_generic_init(void);
include/linux/hidraw.h+2−2
@@ -76,13 +76,13 @@ struct hidraw_list { · 75 unmodified lines
76#ifdef CONFIG_HIDRAW76#ifdef CONFIG_HIDRAW
77int hidraw_init(void);77int hidraw_init(void);
78void hidraw_exit(void);78void hidraw_exit(void);
79void hidraw_report_event(struct hid_device *, u8 *, int);79int hidraw_report_event(struct hid_device *, u8 *, int);
80int hidraw_connect(struct hid_device *);80int hidraw_connect(struct hid_device *);
81void hidraw_disconnect(struct hid_device *);81void hidraw_disconnect(struct hid_device *);
82#else82#else
83static inline int hidraw_init(void) { return 0; }83static inline int hidraw_init(void) { return 0; }
84static inline void hidraw_exit(void) { }84static inline void hidraw_exit(void) { }
85static inline void hidraw_report_event(struct hid_device *hid, u8 *data, int len) { }85static inline int hidraw_report_event(struct hid_device *hid, u8 *data, int len) { return 0; }
86static inline int hidraw_connect(struct hid_device *hid) { return -1; }86static inline int hidraw_connect(struct hid_device *hid) { return -1; }
87static inline void hidraw_disconnect(struct hid_device *hid) { }87static inline void hidraw_disconnect(struct hid_device *hid) { }
88#endif88#endif

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t