diff --git a/[refs] b/[refs] index b89ff9da0b4a..a6703c98134d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8677142710516d986d932d6f1fba7be8382c1fec +refs/heads/master: e6d63840ba55ffd3a79aea6792aac6f29f338083 diff --git a/trunk/block/genhd.c b/trunk/block/genhd.c index 4cd3433c99ac..b8defae2ec03 100644 --- a/trunk/block/genhd.c +++ b/trunk/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.