summaryrefslogtreecommitdiff
path: root/drivers/usb/net/net1080.c
diff options
context:
space:
mode:
authorKyle McMartin <kyle@parisc-linux.org>2005-10-28 20:18:07 +0400
committerKyle McMartin <kyle@parisc-linux.org>2005-10-28 20:18:07 +0400
commit210cc679faf0e1cabda9fc5d1279644f5e52aecb (patch)
treef0816c90ae937a159f8bfec6018a6271223b954a /drivers/usb/net/net1080.c
parente0f998930eb67c49f2862c58a45262ad0bc03eca (diff)
parent260b23674fdb570f3235ce55892246bef1c24c2a (diff)
downloadlinux-210cc679faf0e1cabda9fc5d1279644f5e52aecb.tar.xz
Auto-update from upstream
Diffstat (limited to 'drivers/usb/net/net1080.c')
-rw-r--r--drivers/usb/net/net1080.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/net/net1080.c b/drivers/usb/net/net1080.c
index a4309c4a491b..cee55f8cf64f 100644
--- a/drivers/usb/net/net1080.c
+++ b/drivers/usb/net/net1080.c
@@ -500,7 +500,7 @@ static int net1080_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
}
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;