lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'upstream-fixes'

Browse Source
This commit is contained in:
Jeff Garzik
2005-10-04 05:30:02 -04:00
parent 500f83abdc 832f8f0378
commit d9e34325fd
9 changed files with 135 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/ns83820.c
View File

@@ -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 gfp)
static inline int rx_refill(struct net_device *ndev, unsigned int __nocast gfp)
{
struct ns83820 *dev = PRIV(ndev);
unsigned i;