diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2008-10-21 11:12:00 +0100 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2008-10-21 11:12:00 +0100 |
| commit | c3380942e6699ed5b3e3f37b49ceb724b7699813 (patch) | |
| tree | 516d791cdfd1c7f99a29f71e1a7bba8f75af96e1 /block/genhd.c | |
| parent | 0ffda6cca2c66e42d0ad65719f58c637ed180b05 (diff) | |
| parent | 2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into s3c64xx
Diffstat (limited to 'block/genhd.c')
| -rw-r--r-- | block/genhd.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/block/genhd.c b/block/genhd.c index 4cd3433c99a..646e1d2507c 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -358,7 +358,6 @@ static int blk_mangle_minor(int minor) /** * blk_alloc_devt - allocate a dev_t for a partition * @part: partition to allocate dev_t for - * @gfp_mask: memory allocation flag * @devt: out parameter for resulting dev_t * * Allocate a dev_t for block device. @@ -535,7 +534,7 @@ void unlink_gendisk(struct gendisk *disk) /** * get_gendisk - get partitioning information for a given device * @devt: device to get partitioning information for - * @part: returned partition index + * @partno: returned partition index * * This function gets the structure containing partitioning * information for the given device @devt. |