diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 18:30:16 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 18:30:16 +0200 |
| commit | 15dbb5a3f971a28040ae6cbcd8bbdf19b629fa83 (patch) | |
| tree | e65562d7300ac653207b1e45ec7e5960ddf78fff /drivers/usb/host/ehci-hcd.c | |
| parent | [libata pdc_adma] update for removal of ATA_FLAG_NOINTR (diff) | |
| parent | Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzi... (diff) | |
| download | linux-15dbb5a3f971a28040ae6cbcd8bbdf19b629fa83.tar.xz linux-15dbb5a3f971a28040ae6cbcd8bbdf19b629fa83.zip | |
Merge branch 'master'
Diffstat (limited to 'drivers/usb/host/ehci-hcd.c')
| -rw-r--r-- | drivers/usb/host/ehci-hcd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index b948ffd94f45..f5eb9e7b5b18 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -983,7 +983,7 @@ static int ehci_urb_enqueue ( struct usb_hcd *hcd, struct usb_host_endpoint *ep, struct urb *urb, - unsigned mem_flags + gfp_t mem_flags ) { struct ehci_hcd *ehci = hcd_to_ehci (hcd); struct list_head qtd_list; |