aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-10-26 19:34:14 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-26 19:34:14 -0400
commitecc96e79202ed7225f7a2e2b7cb5a9e09fc74aa6 (patch)
tree8aee0b8d86b71617051dded87e2b7c1ae6c7e55d /include/linux
parenta1a739c56ad031b8bf8b3804f568ac88899f8dd7 (diff)
parentcc6e0bbb47f02fd36cd55b3189c0c79079096ab8 (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: 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/linux')
-rw-r--r--include/linux/hid.h6
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 {
417 struct input_dev *input; 417 struct input_dev *input;
418}; 418};
419 419
420enum hid_type {
421 HID_TYPE_OTHER = 0,
422 HID_TYPE_USBMOUSE
423};
424
420struct hid_driver; 425struct hid_driver;
421struct hid_ll_driver; 426struct hid_ll_driver;
422 427
@@ -431,6 +436,7 @@ struct hid_device { /* device report descriptor */
431 __u32 vendor; /* Vendor ID */ 436 __u32 vendor; /* Vendor ID */
432 __u32 product; /* Product ID */ 437 __u32 product; /* Product ID */
433 __u32 version; /* HID version */ 438 __u32 version; /* HID version */
439 enum hid_type type; /* device type (mouse, kbd, ...) */
434 unsigned country; /* HID country */ 440 unsigned country; /* HID country */
435 struct hid_report_enum report_enum[HID_REPORT_TYPES]; 441 struct hid_report_enum report_enum[HID_REPORT_TYPES];
436 442