diff options
Diffstat (limited to 'include/linux/mod_devicetable.h')
-rw-r--r-- | include/linux/mod_devicetable.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h index 5db93821f9c7..7771d453e5f3 100644 --- a/include/linux/mod_devicetable.h +++ b/include/linux/mod_devicetable.h | |||
@@ -78,6 +78,9 @@ struct ieee1394_device_id { | |||
78 | * of a given interface; other interfaces may support other classes. | 78 | * of a given interface; other interfaces may support other classes. |
79 | * @bInterfaceSubClass: Subclass of interface; associated with bInterfaceClass. | 79 | * @bInterfaceSubClass: Subclass of interface; associated with bInterfaceClass. |
80 | * @bInterfaceProtocol: Protocol of interface; associated with bInterfaceClass. | 80 | * @bInterfaceProtocol: Protocol of interface; associated with bInterfaceClass. |
81 | * @bInterfaceNumber: Number of interface; composite devices may use | ||
82 | * fixed interface numbers to differentiate between vendor-specific | ||
83 | * interfaces. | ||
81 | * @driver_info: Holds information used by the driver. Usually it holds | 84 | * @driver_info: Holds information used by the driver. Usually it holds |
82 | * a pointer to a descriptor understood by the driver, or perhaps | 85 | * a pointer to a descriptor understood by the driver, or perhaps |
83 | * device flags. | 86 | * device flags. |
@@ -115,6 +118,9 @@ struct usb_device_id { | |||
115 | __u8 bInterfaceSubClass; | 118 | __u8 bInterfaceSubClass; |
116 | __u8 bInterfaceProtocol; | 119 | __u8 bInterfaceProtocol; |
117 | 120 | ||
121 | /* Used for vendor-specific interface matches */ | ||
122 | __u8 bInterfaceNumber; | ||
123 | |||
118 | /* not matched against */ | 124 | /* not matched against */ |
119 | kernel_ulong_t driver_info; | 125 | kernel_ulong_t driver_info; |
120 | }; | 126 | }; |
@@ -130,6 +136,7 @@ struct usb_device_id { | |||
130 | #define USB_DEVICE_ID_MATCH_INT_CLASS 0x0080 | 136 | #define USB_DEVICE_ID_MATCH_INT_CLASS 0x0080 |
131 | #define USB_DEVICE_ID_MATCH_INT_SUBCLASS 0x0100 | 137 | #define USB_DEVICE_ID_MATCH_INT_SUBCLASS 0x0100 |
132 | #define USB_DEVICE_ID_MATCH_INT_PROTOCOL 0x0200 | 138 | #define USB_DEVICE_ID_MATCH_INT_PROTOCOL 0x0200 |
139 | #define USB_DEVICE_ID_MATCH_INT_NUMBER 0x0400 | ||
133 | 140 | ||
134 | #define HID_ANY_ID (~0) | 141 | #define HID_ANY_ID (~0) |
135 | #define HID_BUS_ANY 0xffff | 142 | #define HID_BUS_ANY 0xffff |