diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-31 03:17:34 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-31 03:17:34 -0400 |
| commit | a1744d3bee19d3b9cbfb825ab316a101b9c9f109 (patch) | |
| tree | c0e2324c09beca0eb5782eb5abf241ea2b7a4a11 /include/linux/hid.h | |
| parent | 275f165fa970174f8a98205529750e8abb6c0a33 (diff) | |
| parent | a432226614c5616e3cfd211e0acffa0acfb4770c (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/p54/p54common.c
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; |