diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-06-23 11:55:05 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-06-23 11:55:05 +1000 |
| commit | 211459fa89068a61cb3d8c50c741105f59e2c481 (patch) | |
| tree | 41c35b223b00bb531a67a67ffba0766adb879201 /include | |
| parent | 34685fa940926d31c689dded20a52414aa5d1060 (diff) | |
| parent | f35e51ad2576d90d123b31e985f9d3e56679337e (diff) | |
Merge remote-tracking branch 'hid/for-next'
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/hid.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/hid.h b/include/linux/hid.h index 42f7e2fb501f..9cf8e7ae7450 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -453,7 +453,8 @@ struct hid_input { enum hid_type { HID_TYPE_OTHER = 0, - HID_TYPE_USBMOUSE + HID_TYPE_USBMOUSE, + HID_TYPE_USBNONE }; struct hid_driver; |