diff options
Diffstat (limited to 'include/linux/hid.h')
-rw-r--r-- | include/linux/hid.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/linux/hid.h b/include/linux/hid.h index 42f7e2fb501..ab64d4768f6 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h | |||
@@ -453,7 +453,8 @@ struct hid_input { | |||
453 | 453 | ||
454 | enum hid_type { | 454 | enum hid_type { |
455 | HID_TYPE_OTHER = 0, | 455 | HID_TYPE_OTHER = 0, |
456 | HID_TYPE_USBMOUSE | 456 | HID_TYPE_USBMOUSE, |
457 | HID_TYPE_USBNONE | ||
457 | }; | 458 | }; |
458 | 459 | ||
459 | struct hid_driver; | 460 | struct hid_driver; |
@@ -597,6 +598,8 @@ struct hid_usage_id { | |||
597 | * @input_mapping: invoked on input registering before mapping an usage | 598 | * @input_mapping: invoked on input registering before mapping an usage |
598 | * @input_mapped: invoked on input registering after mapping an usage | 599 | * @input_mapped: invoked on input registering after mapping an usage |
599 | * @feature_mapping: invoked on feature registering | 600 | * @feature_mapping: invoked on feature registering |
601 | * @input_register: called just before input device is registered after reports | ||
602 | * are parsed. | ||
600 | * @suspend: invoked on suspend (NULL means nop) | 603 | * @suspend: invoked on suspend (NULL means nop) |
601 | * @resume: invoked on resume if device was not reset (NULL means nop) | 604 | * @resume: invoked on resume if device was not reset (NULL means nop) |
602 | * @reset_resume: invoked on resume if device was reset (NULL means nop) | 605 | * @reset_resume: invoked on resume if device was reset (NULL means nop) |
@@ -643,6 +646,8 @@ struct hid_driver { | |||
643 | void (*feature_mapping)(struct hid_device *hdev, | 646 | void (*feature_mapping)(struct hid_device *hdev, |
644 | struct hid_field *field, | 647 | struct hid_field *field, |
645 | struct hid_usage *usage); | 648 | struct hid_usage *usage); |
649 | int (*input_register)(struct hid_device *hdev, struct hid_input | ||
650 | *hidinput); | ||
646 | #ifdef CONFIG_PM | 651 | #ifdef CONFIG_PM |
647 | int (*suspend)(struct hid_device *hdev, pm_message_t message); | 652 | int (*suspend)(struct hid_device *hdev, pm_message_t message); |
648 | int (*resume)(struct hid_device *hdev); | 653 | int (*resume)(struct hid_device *hdev); |