From 0e99fd1b5bda98073b5853177dde7d5e04bd5871 Mon Sep 17 00:00:00 2001
From: "K. Y. Srinivasan" <kys@microsoft.com>
Date: Tue, 10 May 2011 07:54:15 -0700
Subject: [PATCH] --- yaml --- r: 249471 b: refs/heads/master c:
 280c5f3844631aadd6b57385b0e3b2e58bdb423f h: refs/heads/master i:   249469:
 56e0e0b80452e5795a1cfd39282cfaab3c104931   249467:
 8c84863d917c9c0ea0558aa2835bff64ca2c61a6   249463:
 32a88bbf9301d4d4fe84efdcd852b0af61365ec5   249455:
 e0f7e1536376303e2891398c0167828ad09ea25f   249439:
 0c4b065a51d16774cd3de7eae58e2069ed772632   249407:
 40a763bdd87137a930f782884fb18905a7d86f52   249343:
 bd5b9c42531d8b2415aa2fae85c3186407aada7d v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/staging/hv/storvsc.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 1d3041e606ff..c0037a0d0fd7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 24d9aab0b62aef29a3dc74b0c93fb3648ea6020e
+refs/heads/master: 280c5f3844631aadd6b57385b0e3b2e58bdb423f
diff --git a/trunk/drivers/staging/hv/storvsc.c b/trunk/drivers/staging/hv/storvsc.c
index b2ffbb7b44fa..234ce8b076d2 100644
--- a/trunk/drivers/staging/hv/storvsc.c
+++ b/trunk/drivers/staging/hv/storvsc.c
@@ -412,7 +412,7 @@ static void storvsc_on_channel_callback(void *context)
 	return;
 }
 
-static int stor_vsc_connect_to_vsp(struct hv_device *device)
+static int storvsc_connect_to_vsp(struct hv_device *device)
 {
 	struct vmstorage_channel_properties props;
 	struct storvsc_driver *stor_driver;
@@ -471,7 +471,7 @@ int storvsc_dev_add(struct hv_device *device,
 
 	stor_device->port_number = device_info->port_number;
 	/* Send it back up */
-	ret = stor_vsc_connect_to_vsp(device);
+	ret = storvsc_connect_to_vsp(device);
 
 	device_info->path_id = stor_device->path_id;
 	device_info->target_id = stor_device->target_id;