X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=drivers%2Fnet%2Fsunbmac.c;h=cfaf47c63c58dd1fbeb6c3c5f59290fa49fad804;hb=36ddf5bbdea7ba4582abc62f106f0f0e9f0b6b91;hp=f88f5e32b7145164f916a58e2d23efe3d20fca76;hpb=ab2fd30b668b1687a9ca9e9ea0b60145deeafe84;p=linux-2.6-omap-h63xx.git

diff --git a/drivers/net/sunbmac.c b/drivers/net/sunbmac.c
index f88f5e32b71..cfaf47c63c5 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;