projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
[powerpc.git]
/
drivers
/
usb
/
net
/
usbnet.h
diff --git
a/drivers/usb/net/usbnet.h
b/drivers/usb/net/usbnet.h
index
7aa0abd
..
89fc495
100644
(file)
--- a/
drivers/usb/net/usbnet.h
+++ b/
drivers/usb/net/usbnet.h
@@
-107,7
+107,7
@@
struct driver_info {
/* fixup tx packet (add framing) */
struct sk_buff *(*tx_fixup)(struct usbnet *dev,
- struct sk_buff *skb,
unsigned
flags);
+ struct sk_buff *skb,
gfp_t
flags);
/* for new devices, use the descriptor-reading code instead */
int in; /* rx endpoint */