diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-02-13 05:41:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-02-13 05:41:26 -0800 |
| commit | 780530ff7e092d37bfa150188b2cdd2afb3de00b (patch) | |
| tree | 6348964941a494275ea2547ef7e287392c19cbfb /include | |
| parent | d7a325771fa1ff8c7fad25cf0b602b82f171ec45 (diff) | |
| parent | c907a5bbd2eb98c2bf348779e65f2120b2ce0c55 (diff) | |
Merge bk://linuxusb.bkbits.net/linus-2.5
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/usb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/usb.h b/include/linux/usb.h index 82aeb9a646b1..583af126199b 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h @@ -856,7 +856,7 @@ static inline void usb_fill_int_urb (struct urb *urb, #define FILL_INT_URB(URB,DEV,PIPE,TRANSFER_BUFFER,BUFFER_LENGTH,COMPLETE,CONTEXT,INTERVAL) \ usb_fill_int_urb(URB,DEV,PIPE,TRANSFER_BUFFER,BUFFER_LENGTH,COMPLETE,CONTEXT,INTERVAL) -extern struct urb *usb_alloc_urb(int iso_packets); +extern struct urb *usb_alloc_urb(int iso_packets, int mem_flags); extern void usb_free_urb(struct urb *urb); #define usb_put_urb usb_free_urb extern struct urb *usb_get_urb(struct urb *urb); |