From 1f417aaaf56cc4554590e5f73642296b12b684a5 Mon Sep 17 00:00:00 2001
From: "K. Y. Srinivasan" <kys@microsoft.com>
Date: Tue, 10 May 2011 07:56:10 -0700
Subject: [PATCH] --- yaml --- r: 249586 b: refs/heads/master c:
 428faae18fb11df531fd9f6b1e314f54819190f1 h: refs/heads/master v: v3

---
 [refs]                                |  2 +-
 trunk/drivers/staging/hv/blkvsc_drv.c | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 3ae77fdf6af9..5ab498185e67 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 40bf63ed45520bef3fa6c91674d71927298cb245
+refs/heads/master: 428faae18fb11df531fd9f6b1e314f54819190f1
diff --git a/trunk/drivers/staging/hv/blkvsc_drv.c b/trunk/drivers/staging/hv/blkvsc_drv.c
index 0038a9724418..f67938cb5a15 100644
--- a/trunk/drivers/staging/hv/blkvsc_drv.c
+++ b/trunk/drivers/staging/hv/blkvsc_drv.c
@@ -801,10 +801,10 @@ static void blkvsc_request(struct request_queue *queue)
 
 
 /* The one and only one */
-static  struct storvsc_driver blkvsc_drv = {
-	.base.probe =  blkvsc_probe,
-	.base.remove =  blkvsc_remove,
-	.base.shutdown = blkvsc_shutdown,
+static  struct hv_driver blkvsc_drv = {
+	.probe =  blkvsc_probe,
+	.remove =  blkvsc_remove,
+	.shutdown = blkvsc_shutdown,
 };
 
 static const struct block_device_operations block_ops = {
@@ -820,7 +820,7 @@ static const struct block_device_operations block_ops = {
  */
 static int blkvsc_drv_init(void)
 {
-	struct hv_driver *drv = &blkvsc_drv.base;
+	struct hv_driver *drv = &blkvsc_drv;
 	int ret;
 
 	BUILD_BUG_ON(sizeof(sector_t) != 8);
@@ -844,7 +844,7 @@ static int blkvsc_drv_exit_cb(struct device *dev, void *data)
 
 static void blkvsc_drv_exit(void)
 {
-	struct hv_driver *drv = &blkvsc_drv.base;
+	struct hv_driver *drv = &blkvsc_drv;
 	struct device *current_dev;
 	int ret;