Merge ../bleed-2.6

This commit is contained in:
Greg KH
2005-10-28 10:13:16 -07:00
committed by Greg Kroah-Hartman
591 changed files with 23717 additions and 10531 deletions

View File

@@ -1113,7 +1113,7 @@ static void urb_unlink (struct urb *urb)
* expects usb_submit_urb() to have sanity checked and conditioned all
* inputs in the urb
*/
static int hcd_submit_urb (struct urb *urb, unsigned mem_flags)
static int hcd_submit_urb (struct urb *urb, gfp_t mem_flags)
{
int status;
struct usb_hcd *hcd = urb->dev->bus->hcpriv;