diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-12 06:43:32 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-12 06:43:32 +0200 |
| commit | b6ec995a21a9428aef620b5adf46d047a18d88b8 (patch) | |
| tree | 6719121e6605cbca524b687f47336b9bbf3b8d41 /drivers/net/ns83820.c | |
| parent | powerpc: make iSeries boot again (diff) | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
| download | linux-b6ec995a21a9428aef620b5adf46d047a18d88b8.tar.xz linux-b6ec995a21a9428aef620b5adf46d047a18d88b8.zip | |
Merge from Linus' tree
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 e64df4d0800b..e4811b42a6b7 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, int gfp) +static inline int rx_refill(struct net_device *ndev, gfp_t gfp) { struct ns83820 *dev = PRIV(ndev); unsigned i; |