From c166a6e91aa0aa4ebbfdb7603816dfadc09b8c73 Mon Sep 17 00:00:00 2001
From: Randy Dunlap <rdunlap@xenotime.net>
Date: Sun, 25 Dec 2005 19:27:18 -0800
Subject: [PATCH] --- yaml --- r: 19229 b: refs/heads/master c:
 bf8b2b5345145d41d39035b80f36c8e17342d833 h: refs/heads/master i:   19227:
 cc69ac4d3f7ba27ee97749b3bde1bc36d617b77f v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/usb/host/ehci-sched.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

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;