diff --git a/[refs] b/[refs] index 324010657d19..5dc434e2fcd5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 52ea1619d5103f80ec0472a3eb653a04c15326f2 +refs/heads/master: bf8b2b5345145d41d39035b80f36c8e17342d833 diff --git a/trunk/drivers/usb/host/ehci-sched.c b/trunk/drivers/usb/host/ehci-sched.c index fe0678624ec0..ebcca9700671 100644 --- a/trunk/drivers/usb/host/ehci-sched.c +++ b/trunk/drivers/usb/host/ehci-sched.c @@ -1844,8 +1844,7 @@ static int sitd_submit (struct ehci_hcd *ehci, struct urb *urb, #else static inline int -sitd_submit (struct ehci_hcd *ehci, struct urb *urb, - unsigned mem_flags) +sitd_submit (struct ehci_hcd *ehci, struct urb *urb, gfp_t mem_flags) { ehci_dbg (ehci, "split iso support is disabled\n"); return -ENOSYS;