projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master'
[linux-2.6-block.git]
/
drivers
/
net
/
ns83820.c
diff --git
a/drivers/net/ns83820.c
b/drivers/net/ns83820.c
index a3ea69bca474301789a93c24ea17fefa79b53b66..a3c3fc9c0d8a8ec241b452dde7f4aba968b3bb1d 100644
(file)
--- a/
drivers/net/ns83820.c
+++ b/
drivers/net/ns83820.c
@@
-584,7
+584,7
@@
static inline int ns83820_add_rx_skb(struct ns83820 *dev, struct sk_buff *skb)
return 0;
}
-static inline int rx_refill(struct net_device *ndev,
unsigned int __nocas
t gfp)
+static inline int rx_refill(struct net_device *ndev,
gfp_
t gfp)
{
struct ns83820 *dev = PRIV(ndev);
unsigned i;