diff options
Diffstat (limited to 'drivers/atm')
-rw-r--r-- | drivers/atm/firestream.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c index 101f0cc33d10..b078fa548ebf 100644 --- a/drivers/atm/firestream.c +++ b/drivers/atm/firestream.c | |||
@@ -1374,7 +1374,8 @@ static void reset_chip (struct fs_dev *dev) | |||
1374 | } | 1374 | } |
1375 | } | 1375 | } |
1376 | 1376 | ||
1377 | static void __devinit *aligned_kmalloc (int size, int flags, int alignment) | 1377 | static void __devinit *aligned_kmalloc (int size, unsigned int __nocast flags, |
1378 | int alignment) | ||
1378 | { | 1379 | { |
1379 | void *t; | 1380 | void *t; |
1380 | 1381 | ||
@@ -1464,7 +1465,8 @@ static inline int nr_buffers_in_freepool (struct fs_dev *dev, struct freepool *f | |||
1464 | does. I've seen "receive abort: no buffers" and things started | 1465 | does. I've seen "receive abort: no buffers" and things started |
1465 | working again after that... -- REW */ | 1466 | working again after that... -- REW */ |
1466 | 1467 | ||
1467 | static void top_off_fp (struct fs_dev *dev, struct freepool *fp, int gfp_flags) | 1468 | static void top_off_fp (struct fs_dev *dev, struct freepool *fp, |
1469 | unsigned int __nocast gfp_flags) | ||
1468 | { | 1470 | { |
1469 | struct FS_BPENTRY *qe, *ne; | 1471 | struct FS_BPENTRY *qe, *ne; |
1470 | struct sk_buff *skb; | 1472 | struct sk_buff *skb; |