From d0982002f9c9c3a01c9b240a6b28e9f3e5d0b52b Mon Sep 17 00:00:00 2001
From: "K. Y. Srinivasan" <kys@microsoft.com>
Date: Thu, 8 Sep 2011 07:24:12 -0700
Subject: [PATCH] --- yaml --- r: 268317 b: refs/heads/master c:
 f2c73011117f6b45dea01f5450285405b5e88efb h: refs/heads/master i:   268315:
 921fd9f240949d3fe959a62b7d986bbbdfd05106 v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/staging/hv/channel_mgmt.c | 2 +-
 trunk/drivers/staging/hv/hyperv_vmbus.h | 2 +-
 trunk/drivers/staging/hv/vmbus_drv.c    | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 61956f830f4c..53664e00903a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 170786474a6e6005f865327960da1f534b67ee84
+refs/heads/master: f2c73011117f6b45dea01f5450285405b5e88efb
diff --git a/trunk/drivers/staging/hv/channel_mgmt.c b/trunk/drivers/staging/hv/channel_mgmt.c
index 11beb41c373e..f99b944a9a7f 100644
--- a/trunk/drivers/staging/hv/channel_mgmt.c
+++ b/trunk/drivers/staging/hv/channel_mgmt.c
@@ -383,7 +383,7 @@ static void vmbus_process_offer(struct work_struct *work)
 	 * We need to set the DeviceObject field before calling
 	 * vmbus_child_dev_add()
 	 */
-	newchannel->device_obj = vmbus_child_device_create(
+	newchannel->device_obj = vmbus_device_create(
 		&newchannel->offermsg.offer.if_type,
 		&newchannel->offermsg.offer.if_instance,
 		newchannel);
diff --git a/trunk/drivers/staging/hv/hyperv_vmbus.h b/trunk/drivers/staging/hv/hyperv_vmbus.h
index 16ca90d9ac24..e97e2cf0fa44 100644
--- a/trunk/drivers/staging/hv/hyperv_vmbus.h
+++ b/trunk/drivers/staging/hv/hyperv_vmbus.h
@@ -601,7 +601,7 @@ extern struct vmbus_connection vmbus_connection;
 
 /* General vmbus interface */
 
-struct hv_device *vmbus_child_device_create(uuid_le *type,
+struct hv_device *vmbus_device_create(uuid_le *type,
 					 uuid_le *instance,
 					 struct vmbus_channel *channel);
 
diff --git a/trunk/drivers/staging/hv/vmbus_drv.c b/trunk/drivers/staging/hv/vmbus_drv.c
index c0f3b7a1530b..382baee4dfb2 100644
--- a/trunk/drivers/staging/hv/vmbus_drv.c
+++ b/trunk/drivers/staging/hv/vmbus_drv.c
@@ -594,10 +594,10 @@ void vmbus_driver_unregister(struct hv_driver *hv_driver)
 EXPORT_SYMBOL_GPL(vmbus_driver_unregister);
 
 /*
- * vmbus_child_device_create - Creates and registers a new child device
+ * vmbus_device_create - Creates and registers a new child device
  * on the vmbus.
  */
-struct hv_device *vmbus_child_device_create(uuid_le *type,
+struct hv_device *vmbus_device_create(uuid_le *type,
 					    uuid_le *instance,
 					    struct vmbus_channel *channel)
 {