projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
[powerpc.git]
/
drivers
/
usb
/
net
/
net1080.c
diff --git
a/drivers/usb/net/net1080.c
b/drivers/usb/net/net1080.c
index
a4309c4
..
cee55f8
100644
(file)
--- 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;