X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fatm%2Ffirestream.c;h=7f7ec288824d075ed2826422e113abba8bebd1a1;hb=72d9486169a2a8353e022813185ba2f32d7dde69;hp=58219744f5dbfef006d41888c893ff54be6648c8;hpb=1fdab81e675c6ef76a49b8aabb7eaf4be51d1b80;p=linux-2.6-omap-h63xx.git

diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c
index 58219744f5d..7f7ec288824 100644
--- a/drivers/atm/firestream.c
+++ b/drivers/atm/firestream.c
@@ -1374,8 +1374,7 @@ static void reset_chip (struct fs_dev *dev)
 	}
 }
 
-static void __devinit *aligned_kmalloc (int size, unsigned int __nocast flags,
-					int alignment)
+static void __devinit *aligned_kmalloc (int size, gfp_t flags, int alignment)
 {
 	void  *t;
 
@@ -1466,7 +1465,7 @@ static inline int nr_buffers_in_freepool (struct fs_dev *dev, struct freepool *f
    working again after that...  -- REW */
 
 static void top_off_fp (struct fs_dev *dev, struct freepool *fp,
-			unsigned int __nocast gfp_flags)
+			gfp_t gfp_flags)
 {
 	struct FS_BPENTRY *qe, *ne;
 	struct sk_buff *skb;