diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-07-13 15:15:43 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-07-13 15:15:43 -0400 |
| commit | 99ad25a313bda566a346b46a6015afa65bc0a02b (patch) | |
| tree | b9443fed1ab74f320c4ee0791864ee96d7c069df /drivers/usb/host/ehci-q.c | |
| parent | f62c4a96f74d6c6dd56d1742697e94a5c2085e87 (diff) | |
| parent | 9a556e89081b0c1c2f83cee915363b15a68a6f2d (diff) | |
Auto merge with /home/aegl/GIT/linus
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; |