diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 12:17:52 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 12:17:52 -0400 |
| commit | 90890687859ea658759e653c4e70ed7e9e1a6217 (patch) | |
| tree | 9065b30bb189e16ef99b8b5a0d444558f8dc579f /drivers/usb/core/urb.c | |
| parent | 2995bfb7855aabd493f840af361f3dd7d221caea (diff) | |
| parent | 5fadd053d9bb4345ec6f405d24db4e7eb49cf81e (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/usb/core/urb.c')
| -rw-r--r-- | drivers/usb/core/urb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/core/urb.c b/drivers/usb/core/urb.c index c846fefb7386..b32898e0a27d 100644 --- a/drivers/usb/core/urb.c +++ b/drivers/usb/core/urb.c | |||
| @@ -60,7 +60,7 @@ void usb_init_urb(struct urb *urb) | |||
| 60 | * | 60 | * |
| 61 | * The driver must call usb_free_urb() when it is finished with the urb. | 61 | * The driver must call usb_free_urb() when it is finished with the urb. |
| 62 | */ | 62 | */ |
| 63 | struct urb *usb_alloc_urb(int iso_packets, unsigned mem_flags) | 63 | struct urb *usb_alloc_urb(int iso_packets, gfp_t mem_flags) |
| 64 | { | 64 | { |
| 65 | struct urb *urb; | 65 | struct urb *urb; |
| 66 | 66 | ||
| @@ -224,7 +224,7 @@ struct urb * usb_get_urb(struct urb *urb) | |||
| 224 | * GFP_NOIO, unless b) or c) apply | 224 | * GFP_NOIO, unless b) or c) apply |
| 225 | * | 225 | * |
| 226 | */ | 226 | */ |
| 227 | int usb_submit_urb(struct urb *urb, unsigned mem_flags) | 227 | int usb_submit_urb(struct urb *urb, gfp_t mem_flags) |
| 228 | { | 228 | { |
| 229 | int pipe, temp, max; | 229 | int pipe, temp, max; |
| 230 | struct usb_device *dev; | 230 | struct usb_device *dev; |