commit 55016f10e31bb15b85d8c500f979dfdceb37d548
author Al Viro <viro@zeniv.linux.org.uk> Fri Oct 21 03:21:58 2005 -0400
committer Linus Torvalds <torvalds@g5.osdl.org> Fri Oct 28 08:16:49 2005 -0700
tree 39bbbd7deb4a61e6c7d3ace28de8e069ffe407bc
parent 970a9e73f9036ef89d46b8240f99463f6d244c1d

[PATCH] gfp_t: drivers/usb

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

drivers/usb/net/net1080.c

diff --git a/drivers/usb/net/net1080.c b/drivers/usb/net/net1080.c
index a4309c4..cee55f8 100644
--- a/drivers/usb/net/net1080.c
+++ b/drivers/usb/net/net1080.c
@@ -500,7 +500,7 @@
 }
 
 static struct sk_buff *
-net1080_tx_fixup(struct usbnet *dev, struct sk_buff *skb, unsigned flags)
+net1080_tx_fixup(struct usbnet *dev, struct sk_buff *skb, gfp_t flags)
 {
 	int			padlen;
 	struct sk_buff		*skb2;