diff options
| author | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-05 00:16:39 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-05 00:16:39 -0800 |
| commit | 463727d199b089c420e750d43f75ea9403a45e12 (patch) | |
| tree | 5bc53f8216433d437c754729fc8208a908f7b7dd /include/linux/usb.h | |
| parent | 0713f0290054eb9769d588120712e3dccfb3ec34 (diff) | |
v2.5.2.2 -> v2.5.2.3
- Al Viro: VFS inode allocation moved down to filesystem, trim inodes
- Greg KH: USB update, hotplug documentation
- Kai Germaschewski: ISDN update
- Ingo Molnar: scheduler tweaking ("J2")
- Arnaldo: emu10k kdev_t updates
- Ben Collins: firewire updates
- Björn Wesen: cris arch update
- Hal Duston: ps2esdi driver bio/kdev_t fixes
- Jean Tourrilhes: move wireless drivers into drivers/net/wireless,
update wireless API #1
- Richard Gooch: devfs race fix
- OGAWA Hirofumi: FATFS update
Diffstat (limited to 'include/linux/usb.h')
| -rw-r--r-- | include/linux/usb.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/include/linux/usb.h b/include/linux/usb.h index d53844b91db3..5309034e511e 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h @@ -576,13 +576,12 @@ extern void usb_deregister(struct usb_driver *); /* ... less overhead for QUEUE_BULK */ #define USB_TIMEOUT_KILLED 0x1000 /* only set by HCD! */ -typedef struct -{ +struct usb_iso_packet_descriptor { unsigned int offset; unsigned int length; /* expected length */ unsigned int actual_length; unsigned int status; -} iso_packet_descriptor_t; +}; struct urb; @@ -741,11 +740,9 @@ struct urb int timeout; /* (in) timeout, in jiffies */ void *context; /* (in) context for completion */ usb_complete_t complete; /* (in) completion routine */ - iso_packet_descriptor_t iso_frame_desc[0]; /* (in) ISO ONLY */ + struct usb_iso_packet_descriptor iso_frame_desc[0]; /* (in) ISO ONLY */ }; -typedef struct urb urb_t; - /** * usb_fill_control_urb - initializes a control urb * @urb: pointer to the urb to initialize. |