Merge commit 'linus/master' into sched-fixes-for-linus

[linux-2.6] / drivers / block / brd.c

diff --git a/drivers/block/brd.c b/drivers/block/brd.c
index a196ef7f147fa234ead35696b8c115dd9ea69927..680cdfc00b90b99714113b32199aeca2a97e72be 100644 (file)
--- a/drivers/block/brd.c
+++ b/drivers/block/brd.c
@@ -447,6 +447,7 @@ static struct brd_device *brd_alloc(int i)
        disk->fops              = &brd_fops;
        disk->private_data      = brd;
        disk->queue             = brd->brd_queue;
+       disk->flags |= GENHD_FL_SUPPRESS_PARTITION_INFO;
        sprintf(disk->disk_name, "ram%d", i);
        set_capacity(disk, rd_size * 2);