diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-30 14:51:43 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-30 14:51:43 -0400 |
commit | cdcba02a5f64f4df20b6749a0169124e38ecb733 (patch) | |
tree | bea066c2ddb66038a5e775708dc6e0949375f106 /include/linux | |
parent | 53387b0151260f6c3513adeca77f05ed052d6217 (diff) | |
parent | fa157bdfe87c5ea98a80b96cb08f1ab509e21a52 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
HID: add quirk entry for no-name keyboard (0x13ba/0x0017)
HID: fix hid_device_id for cross compiling
HID: sync on deleted io_retry timer in usbhid driver
HID: fix oops during suspend of unbound HID devices
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/hid.h | 1 | ||||
-rw-r--r-- | include/linux/mod_devicetable.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/hid.h b/include/linux/hid.h index 5355ca4b939e..e5780f8c934a 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h | |||
@@ -410,6 +410,7 @@ struct hid_output_fifo { | |||
410 | #define HID_SUSPENDED 5 | 410 | #define HID_SUSPENDED 5 |
411 | #define HID_CLEAR_HALT 6 | 411 | #define HID_CLEAR_HALT 6 |
412 | #define HID_DISCONNECTED 7 | 412 | #define HID_DISCONNECTED 7 |
413 | #define HID_STARTED 8 | ||
413 | 414 | ||
414 | struct hid_input { | 415 | struct hid_input { |
415 | struct list_head list; | 416 | struct list_head list; |
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h index eb71b45fdf5a..97b91d1abb43 100644 --- a/include/linux/mod_devicetable.h +++ b/include/linux/mod_devicetable.h | |||
@@ -135,6 +135,7 @@ struct usb_device_id { | |||
135 | 135 | ||
136 | struct hid_device_id { | 136 | struct hid_device_id { |
137 | __u16 bus; | 137 | __u16 bus; |
138 | __u16 pad1; | ||
138 | __u32 vendor; | 139 | __u32 vendor; |
139 | __u32 product; | 140 | __u32 product; |
140 | kernel_ulong_t driver_data | 141 | kernel_ulong_t driver_data |