diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-22 15:02:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-22 15:02:58 -0700 |
| commit | 22a3b9771117d566def0150ea787fcc95f16e724 (patch) | |
| tree | 20e24aa4df50cde8d28211531e893a7be61d1dfe /include/linux/hid.h | |
| parent | acb41c0f928fdb84a1c3753ac92c534a2a0f08d2 (diff) | |
| parent | a91f423e598912ab301592c7759cfd89e10682a1 (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: (31 commits)
HID: fix support for Microsoft comfort mouse 4500
HID: hid-multitouch: add one new multitouch device's VID/PID
HID: prodikeys: remove a redundant forward declaration of struct pcmidi_snd
HID: prodikeys: make needlessly global symbols static
HID: emsff: properly handle emsff_init failure
HID: ACRUX - add missing hid_hw_stop() in ax_probe() error path
HID: fix horizontal wheel for ms comfort mouse 4500
HID: uclogic: Add support for UC-Logic WP1062
HID: wiimote: Add sysfs support to wiimote driver
HID: wiimote: Cache wiimote led state
HID: wiimote: Add wiimote led request
HID: wiimote: Add wiimote input button parser
HID: wiimote: Add wiimote event handler
HID: wiimote: Add output queue for wiimote driver
HID: wiimote: Add wiimote send function
HID: wiimote: Synchronize wiimote input and hid event handling
HID: wiimote: Register input device in wiimote hid driver
HID: wiimote: Add wiimote device structure
HID: wiimote: Register wiimote hid driver stub
HID: wiimote: Add Nintendo Wii Remote driver stub
...
Diffstat (limited to 'include/linux/hid.h')
| -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 42f7e2fb501..9cf8e7ae745 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; |