diff options
| author | David Vrabel <david.vrabel@csr.com> | 2008-11-19 09:48:07 -0500 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2008-11-19 09:48:07 -0500 |
| commit | dba0a918722ee0f0ba3442575e4448c3ab622be4 (patch) | |
| tree | fdb466cf09e7916135098d651b18924b2fe9ba5f /include/linux/hid.h | |
| parent | 0996e6382482ce9014787693d3884e9468153a5c (diff) | |
| parent | 7f0f598a0069d1ab072375965a4b69137233169c (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Diffstat (limited to 'include/linux/hid.h')
| -rw-r--r-- | include/linux/hid.h | 1 |
1 files changed, 1 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; |