diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
| commit | 23fd07750a789a66fe88cf173d52a18f1a387da4 (patch) | |
| tree | 06fdd6df35fdb835abdaa9b754d62f6b84b97250 /drivers/block/rd.c | |
| parent | bd787d438a59266af3c9f6351644c85ef1dd21fe (diff) | |
| parent | ed28f96ac1960f30f818374d65be71d2fdf811b0 (diff) | |
Merge ../linux-2.6 by hand
Diffstat (limited to 'drivers/block/rd.c')
| -rw-r--r-- | drivers/block/rd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/rd.c b/drivers/block/rd.c index 145c1fbffe01..68c60a5bcdab 100644 --- a/drivers/block/rd.c +++ b/drivers/block/rd.c | |||
| @@ -348,7 +348,7 @@ static int rd_open(struct inode *inode, struct file *filp) | |||
| 348 | struct block_device *bdev = inode->i_bdev; | 348 | struct block_device *bdev = inode->i_bdev; |
| 349 | struct address_space *mapping; | 349 | struct address_space *mapping; |
| 350 | unsigned bsize; | 350 | unsigned bsize; |
| 351 | int gfp_mask; | 351 | gfp_t gfp_mask; |
| 352 | 352 | ||
| 353 | inode = igrab(bdev->bd_inode); | 353 | inode = igrab(bdev->bd_inode); |
| 354 | rd_bdev[unit] = bdev; | 354 | rd_bdev[unit] = bdev; |