From d871c940ed6b66c0c2786739ebd6587174a115c3 Mon Sep 17 00:00:00 2001
From: Marcelo Tosatti <mtosatti@redhat.com>
Date: Thu, 24 Apr 2008 15:49:53 -0300
Subject: [PATCH] --- yaml --- r: 95759 b: refs/heads/master c:
 2e895e4c23b7f73dba7238db5c5c2dcffb2a4d9d h: refs/heads/master i:   95757:
 0fef5d9c94ccd5d72c0ecd465ddf31a0e3070470   95755:
 1df250c8bdd5738ee1bccc657b36c71a9607b223   95751:
 1d02d22979db1903f6ee7b319b0344c021f4a7e2   95743:
 d7dfffab0cb0b2509279ad7a6225a5971bd1b718 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/block/virtio_blk.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index bdecfee190a5..cad2b3ebf9d8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0527168522c25121bdd5d5f1d3c5b484d972ea14
+refs/heads/master: 2e895e4c23b7f73dba7238db5c5c2dcffb2a4d9d
diff --git a/trunk/drivers/block/virtio_blk.c b/trunk/drivers/block/virtio_blk.c
index fb283af38023..7e83b6c6e3d6 100644
--- a/trunk/drivers/block/virtio_blk.c
+++ b/trunk/drivers/block/virtio_blk.c
@@ -289,7 +289,6 @@ static int virtblk_probe(struct virtio_device *vdev)
 static void virtblk_remove(struct virtio_device *vdev)
 {
 	struct virtio_blk *vblk = vdev->priv;
-	int major = vblk->disk->major;
 
 	/* Nothing should be pending. */
 	BUG_ON(!list_empty(&vblk->reqs));
@@ -299,7 +298,6 @@ static void virtblk_remove(struct virtio_device *vdev)
 
 	blk_cleanup_queue(vblk->disk->queue);
 	put_disk(vblk->disk);
-	unregister_blkdev(major, "virtblk");
 	mempool_destroy(vblk->pool);
 	vdev->config->del_vq(vblk->vq);
 	kfree(vblk);