X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fnet%2Fmyri_sbus.c;h=6c86dca62e2a565b6d611178d3894ee7120d9874;hb=407cf84f956ee4b52da5508d5357b8ae212ff77c;hp=f0996ce5c268698b060a784fbe1ab0661817b577;hpb=b857c730d4e960d1876ff56ce5c4bd81ea9ff5ae;p=linux-2.6

diff --git a/drivers/net/myri_sbus.c b/drivers/net/myri_sbus.c
index f0996ce5c2..6c86dca62e 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)
 	struct recvq __iomem *rq = mp->rq;
 	struct myri_rxd __iomem *rxd = &rq->myri_rxd[0];
 	struct net_device *dev = mp->dev;
-	int gfp_flags = GFP_KERNEL;
+	gfp_t gfp_flags = GFP_KERNEL;
 	int i;
 
 	if (from_irq || in_interrupt())