summaryrefslogtreecommitdiffstats
path: root/drivers/usb/net/asix.c
diff options
context:
space:
mode:
authorGreg KH <greg@press.(none)>2005-10-28 19:13:16 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2005-10-28 19:13:16 +0200
commit6fbfddcb52d8d9fa2cd209f5ac2a1c87497d55b5 (patch)
treec0414e89678fcef7ce3493e048d855bde781ae8d /drivers/usb/net/asix.c
parent[PATCH] Fix documentation of driver suspend/resume callbacks (diff)
parentMerge master.kernel.org:/home/rmk/linux-2.6-mmc (diff)
downloadlinux-6fbfddcb52d8d9fa2cd209f5ac2a1c87497d55b5.tar.xz
linux-6fbfddcb52d8d9fa2cd209f5ac2a1c87497d55b5.zip
Merge ../bleed-2.6
Diffstat (limited to 'drivers/usb/net/asix.c')
-rw-r--r--drivers/usb/net/asix.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/net/asix.c b/drivers/usb/net/asix.c
index 861f00a43750..252a34fbb42c 100644
--- a/drivers/usb/net/asix.c
+++ b/drivers/usb/net/asix.c
@@ -753,7 +753,7 @@ static int ax88772_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
}
static struct sk_buff *ax88772_tx_fixup(struct usbnet *dev, struct sk_buff *skb,
- unsigned flags)
+ gfp_t flags)
{
int padlen;
int headroom = skb_headroom(skb);