diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2005-10-21 03:22:29 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 11:16:51 -0400 |
| commit | 9e24974db6b01ec067c24de09588282b6a1407f0 (patch) | |
| tree | 5ed1cc85738f76bfab07e61df84f55e35d642aca /drivers/net/myri_sbus.c | |
| parent | 53f9fc93f90a43701d6aaf3919be0614bb088b83 (diff) | |
[PATCH] gfp_t: drivers/net
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/net/myri_sbus.c')
| -rw-r--r-- | drivers/net/myri_sbus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/myri_sbus.c b/drivers/net/myri_sbus.c index f0996ce5c268..6c86dca62e2a 100644 --- a/drivers/net/myri_sbus.c +++ b/drivers/net/myri_sbus.c | |||
| @@ -277,7 +277,7 @@ static void myri_init_rings(struct myri_eth *mp, int from_irq) | |||
| 277 | struct recvq __iomem *rq = mp->rq; | 277 | struct recvq __iomem *rq = mp->rq; |
| 278 | struct myri_rxd __iomem *rxd = &rq->myri_rxd[0]; | 278 | struct myri_rxd __iomem *rxd = &rq->myri_rxd[0]; |
| 279 | struct net_device *dev = mp->dev; | 279 | struct net_device *dev = mp->dev; |
| 280 | int gfp_flags = GFP_KERNEL; | 280 | gfp_t gfp_flags = GFP_KERNEL; |
| 281 | int i; | 281 | int i; |
| 282 | 282 | ||
| 283 | if (from_irq || in_interrupt()) | 283 | if (from_irq || in_interrupt()) |