diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-04 11:30:02 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-04 11:30:02 +0200 |
| commit | d9e34325fd62310b7b49243d02b774f3ef2452db (patch) | |
| tree | d356eab72377f2576ad356de66daec23f28529a5 /drivers/net/ns83820.c | |
| parent | [PATCH] s390: introducing support in qeth for new OSA CHPID type OSN (diff) | |
| parent | [PATCH] sungem: fix gfp flags type (diff) | |
| download | linux-d9e34325fd62310b7b49243d02b774f3ef2452db.tar.xz linux-d9e34325fd62310b7b49243d02b774f3ef2452db.zip | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'drivers/net/ns83820.c')
| -rw-r--r-- | drivers/net/ns83820.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ns83820.c b/drivers/net/ns83820.c index bc354a80c099..a3ea69bca474 100644 --- 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 gfp) +static inline int rx_refill(struct net_device *ndev, unsigned int __nocast gfp) { struct ns83820 *dev = PRIV(ndev); unsigned i; |