diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-07-13 16:23:51 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-07-13 16:23:51 -0400 |
| commit | 327309e899662b482c58cf25f574513d38b5788c (patch) | |
| tree | 069de438aa0e92dd9b6ba28e6b207e2cd07151a5 /drivers/usb/host/ehci-q.c | |
| parent | 0c168775709faa74c1b87f1e61046e0c51ade7f3 (diff) | |
| parent | c32511e2718618f0b53479eb36e07439aa363a74 (diff) | |
Merge upstream 2.6.13-rc3 into ieee80211 branch of netdev-2.6.
Diffstat (limited to 'drivers/usb/host/ehci-q.c')
| -rw-r--r-- | drivers/usb/host/ehci-q.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/ehci-q.c b/drivers/usb/host/ehci-q.c index 45d89a7083b1..d74b2d68a50e 100644 --- a/drivers/usb/host/ehci-q.c +++ b/drivers/usb/host/ehci-q.c | |||
| @@ -898,7 +898,7 @@ submit_async ( | |||
| 898 | struct usb_host_endpoint *ep, | 898 | struct usb_host_endpoint *ep, |
| 899 | struct urb *urb, | 899 | struct urb *urb, |
| 900 | struct list_head *qtd_list, | 900 | struct list_head *qtd_list, |
| 901 | int mem_flags | 901 | unsigned mem_flags |
| 902 | ) { | 902 | ) { |
| 903 | struct ehci_qtd *qtd; | 903 | struct ehci_qtd *qtd; |
| 904 | int epnum; | 904 | int epnum; |