Merge branch 'akpm' (patches from Andrew)

[linux-2.6-microblaze.git] / drivers / block / zram / zram_drv.c

diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
index 9a46b2e..cb253d8 100644 (file)
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@ -1940,6 +1940,7 @@ static int zram_add(void)
        zram->disk->major = zram_major;
        zram->disk->first_minor = device_id;
        zram->disk->minors = 1;
+       zram->disk->flags |= GENHD_FL_NO_PART;
        zram->disk->fops = &zram_devops;
        zram->disk->private_data = zram;
        snprintf(zram->disk->disk_name, 16, "zram%d", device_id);