summaryrefslogtreecommitdiffstats
path: root/drivers/net/sunbmac.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2005-10-21 09:22:29 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-28 17:16:51 +0200
commit9e24974db6b01ec067c24de09588282b6a1407f0 (patch)
tree5ed1cc85738f76bfab07e61df84f55e35d642aca /drivers/net/sunbmac.c
parent[PATCH] gfp_t: remaining bits of arch/* (diff)
downloadlinux-9e24974db6b01ec067c24de09588282b6a1407f0.tar.xz
linux-9e24974db6b01ec067c24de09588282b6a1407f0.zip
[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/sunbmac.c')
-rw-r--r--drivers/net/sunbmac.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/sunbmac.c b/drivers/net/sunbmac.c
index f88f5e32b714..cfaf47c63c58 100644
--- a/drivers/net/sunbmac.c
+++ b/drivers/net/sunbmac.c
@@ -214,7 +214,8 @@ static void bigmac_init_rings(struct bigmac *bp, int from_irq)
{
struct bmac_init_block *bb = bp->bmac_block;
struct net_device *dev = bp->dev;
- int i, gfp_flags = GFP_KERNEL;
+ int i;
+ gfp_t gfp_flags = GFP_KERNEL;
if (from_irq || in_interrupt())
gfp_flags = GFP_ATOMIC;