diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
| commit | 4ad99f15c6a3cadf36928c399459ea4fdb3d49f9 (patch) | |
| tree | d0536e4da737900fa27b235f175a3d179d692200 /include/linux/usb.h | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'include/linux/usb.h')
| -rw-r--r-- | include/linux/usb.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/usb.h b/include/linux/usb.h index 190cc1b78fe2..5482bfb3303d 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h | |||
| @@ -764,9 +764,8 @@ struct usb_iso_packet_descriptor { | |||
| 764 | }; | 764 | }; |
| 765 | 765 | ||
| 766 | struct urb; | 766 | struct urb; |
| 767 | struct pt_regs; | ||
| 768 | 767 | ||
| 769 | typedef void (*usb_complete_t)(struct urb *, struct pt_regs *); | 768 | typedef void (*usb_complete_t)(struct urb *); |
| 770 | 769 | ||
| 771 | /** | 770 | /** |
| 772 | * struct urb - USB Request Block | 771 | * struct urb - USB Request Block |