diff options
author | Dave Airlie <airlied@starflyer.(none)> | 2005-10-20 04:21:33 -0400 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2005-10-20 04:21:33 -0400 |
commit | 312f5726055534be1dc9dd369be13aabd2943fcb (patch) | |
tree | 29394a3f83b4952a73b36a4aa962dfeda839e9db /drivers/atm/firestream.c | |
parent | 3d5efad953c6d5ba11d5bcb584ef8e906f953a73 (diff) | |
parent | 93918e9afc76717176e9e114e79cdbb602a45ae8 (diff) |
merge Linus head tree into my drm tree and fix up conflicts
Diffstat (limited to 'drivers/atm/firestream.c')
-rw-r--r-- | drivers/atm/firestream.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/atm/firestream.c b/drivers/atm/firestream.c index 58219744f5db..7f7ec288824d 100644 --- a/drivers/atm/firestream.c +++ b/drivers/atm/firestream.c | |||
@@ -1374,8 +1374,7 @@ static void reset_chip (struct fs_dev *dev) | |||
1374 | } | 1374 | } |
1375 | } | 1375 | } |
1376 | 1376 | ||
1377 | static void __devinit *aligned_kmalloc (int size, unsigned int __nocast flags, | 1377 | static void __devinit *aligned_kmalloc (int size, gfp_t flags, int alignment) |
1378 | int alignment) | ||
1379 | { | 1378 | { |
1380 | void *t; | 1379 | void *t; |
1381 | 1380 | ||
@@ -1466,7 +1465,7 @@ static inline int nr_buffers_in_freepool (struct fs_dev *dev, struct freepool *f | |||
1466 | working again after that... -- REW */ | 1465 | working again after that... -- REW */ |
1467 | 1466 | ||
1468 | static void top_off_fp (struct fs_dev *dev, struct freepool *fp, | 1467 | static void top_off_fp (struct fs_dev *dev, struct freepool *fp, |
1469 | unsigned int __nocast gfp_flags) | 1468 | gfp_t gfp_flags) |
1470 | { | 1469 | { |
1471 | struct FS_BPENTRY *qe, *ne; | 1470 | struct FS_BPENTRY *qe, *ne; |
1472 | struct sk_buff *skb; | 1471 | struct sk_buff *skb; |