diff options
| author | Greg Kroah-Hartman <greg@kroah.com> | 2002-12-04 13:06:55 -0600 |
|---|---|---|
| committer | Greg Kroah-Hartman <greg@kroah.com> | 2002-12-04 13:06:55 -0600 |
| commit | 0d50877db01d81d671c317a868c15ddfda81664f (patch) | |
| tree | 246ef73571589c0ddee9430a4c928c5bccc02e3e /include | |
| parent | 2becf2fd04bdad4a7d0acb94fef355a0b3febfdb (diff) | |
| parent | 35945ccfe47dac71c7f1b4cd978087682788c78f (diff) | |
Merge kroah.com:/home/greg/linux/BK/bleeding_edge-2.5
into kroah.com:/home/greg/linux/BK/gregkh-2.5
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/usb.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/include/linux/usb.h b/include/linux/usb.h index 774d35815121..9cc9f1d2e2df 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h @@ -414,7 +414,7 @@ struct usb_device_id { * specific device. */ #define USB_DEVICE(vend,prod) \ - match_flags: USB_DEVICE_ID_MATCH_DEVICE, idVendor: (vend), idProduct: (prod) + .match_flags = USB_DEVICE_ID_MATCH_DEVICE, .idVendor = (vend), .idProduct = (prod) /** * USB_DEVICE_VER - macro used to describe a specific usb device with a version range * @vend: the 16 bit USB Vendor ID @@ -426,7 +426,7 @@ struct usb_device_id { * specific device, with a version range. */ #define USB_DEVICE_VER(vend,prod,lo,hi) \ - match_flags: USB_DEVICE_ID_MATCH_DEVICE_AND_VERSION, idVendor: (vend), idProduct: (prod), bcdDevice_lo: (lo), bcdDevice_hi: (hi) + .match_flags = USB_DEVICE_ID_MATCH_DEVICE_AND_VERSION, .idVendor = (vend), .idProduct = (prod), .bcdDevice_lo = (lo), .bcdDevice_hi = (hi) /** * USB_DEVICE_INFO - macro used to describe a class of usb devices @@ -438,7 +438,7 @@ struct usb_device_id { * specific class of devices. */ #define USB_DEVICE_INFO(cl,sc,pr) \ - match_flags: USB_DEVICE_ID_MATCH_DEV_INFO, bDeviceClass: (cl), bDeviceSubClass: (sc), bDeviceProtocol: (pr) + .match_flags = USB_DEVICE_ID_MATCH_DEV_INFO, .bDeviceClass = (cl), .bDeviceSubClass = (sc), .bDeviceProtocol = (pr) /** * USB_INTERFACE_INFO - macro used to describe a class of usb interfaces @@ -450,7 +450,7 @@ struct usb_device_id { * specific class of interfaces. */ #define USB_INTERFACE_INFO(cl,sc,pr) \ - match_flags: USB_DEVICE_ID_MATCH_INT_INFO, bInterfaceClass: (cl), bInterfaceSubClass: (sc), bInterfaceProtocol: (pr) + .match_flags = USB_DEVICE_ID_MATCH_INT_INFO, .bInterfaceClass = (cl), .bInterfaceSubClass = (sc), .bInterfaceProtocol = (pr) /* -------------------------------------------------------------------------- */ @@ -554,8 +554,9 @@ struct usb_iso_packet_descriptor { }; struct urb; +struct pt_regs; -typedef void (*usb_complete_t)(struct urb *); +typedef void (*usb_complete_t)(struct urb *, struct pt_regs *); /** * struct urb - USB Request Block |