diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-26 16:34:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-26 16:34:14 -0700 |
| commit | ecc96e79202ed7225f7a2e2b7cb5a9e09fc74aa6 (patch) | |
| tree | 8aee0b8d86b71617051dded87e2b7c1ae6c7e55d /include | |
| parent | a1a739c56ad031b8bf8b3804f568ac88899f8dd7 (diff) | |
| parent | cc6e0bbb47f02fd36cd55b3189c0c79079096ab8 (diff) | |
| download | lwn-ecc96e79202ed7225f7a2e2b7cb5a9e09fc74aa6.tar.gz lwn-ecc96e79202ed7225f7a2e2b7cb5a9e09fc74aa6.zip | |
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 support for Sony Vaio VGX-TP1E
HID: fix lock imbalance in hiddev
HID: fix lock imbalance in hidraw
HID: fix hidbus/appletouch device binding regression
HID: add hid_type to general hid struct
HID: quirk for OLED devices present in ASUS G50/G70/G71
HID: Remove "default m" for Thrustmaster and Zeroplus
HID: fix hidraw_exit section mismatch
HID: add support for another Gyration remote control
Revert "HID: Invert HWHEEL mappings for some Logitech mice"
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/hid.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/hid.h b/include/linux/hid.h index f13bca2dd53b..5355ca4b939e 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -417,6 +417,11 @@ struct hid_input { struct input_dev *input; }; +enum hid_type { + HID_TYPE_OTHER = 0, + HID_TYPE_USBMOUSE +}; + struct hid_driver; struct hid_ll_driver; @@ -431,6 +436,7 @@ struct hid_device { /* device report descriptor */ __u32 vendor; /* Vendor ID */ __u32 product; /* Product ID */ __u32 version; /* HID version */ + enum hid_type type; /* device type (mouse, kbd, ...) */ unsigned country; /* HID country */ struct hid_report_enum report_enum[HID_REPORT_TYPES]; |