From ee214e2e51528d9791866ad7f89c0d6a99f15ab0 Mon Sep 17 00:00:00 2001
From: matt mooney <mfm@muteddisk.com>
Date: Thu, 19 May 2011 21:37:06 -0700
Subject: [PATCH] --- yaml --- r: 259491 b: refs/heads/master c:
 0392bbb6f6af31888570a24641158d9b51b07eb6 h: refs/heads/master i:   259489:
 22624cccc6c4951e2a9b940378ed9068e42be6e2   259487:
 5ddf80983f49d650f2cab6af409a58ac6687431a v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/staging/usbip/vhci_hcd.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index c1e90f8baf75..b19bf2bc6e99 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3028d0ae6c69318c11f67affb29411d30c0cb955
+refs/heads/master: 0392bbb6f6af31888570a24641158d9b51b07eb6
diff --git a/trunk/drivers/staging/usbip/vhci_hcd.c b/trunk/drivers/staging/usbip/vhci_hcd.c
index 5b94b8037c52..359b4647b601 100644
--- a/trunk/drivers/staging/usbip/vhci_hcd.c
+++ b/trunk/drivers/staging/usbip/vhci_hcd.c
@@ -1209,7 +1209,7 @@ static struct platform_device the_pdev = {
 	},
 };
 
-static int __init vhci_init(void)
+static int __init vhci_hcd_init(void)
 {
 	int ret;
 
@@ -1233,14 +1233,14 @@ static int __init vhci_init(void)
 	return ret;
 }
 
-static void __exit vhci_cleanup(void)
+static void __exit vhci_hcd_exit(void)
 {
 	platform_device_unregister(&the_pdev);
 	platform_driver_unregister(&vhci_driver);
 }
 
-module_init(vhci_init);
-module_exit(vhci_cleanup);
+module_init(vhci_hcd_init);
+module_exit(vhci_hcd_exit);
 
 MODULE_AUTHOR(DRIVER_AUTHOR);
 MODULE_DESCRIPTION(DRIVER_DESC);