From 577acd41d8af0d0380f2e0f432a0d1cf8cdea1dc Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed, 5 May 2010 22:34:18 -0700
Subject: [PATCH] --- yaml --- r: 197329 b: refs/heads/master c:
 ff39524bc463e63003d824d4106eda83762d648b h: refs/heads/master i:   197327:
 5f1eca49a3e76ddfba94e1661ddc3f8faf3cbb60 v: v3

---
 [refs]                                                     | 2 +-
 trunk/drivers/staging/hv/Makefile                          | 2 +-
 trunk/drivers/staging/hv/VmbusPrivate.h                    | 2 +-
 trunk/drivers/staging/hv/channel.h                         | 2 +-
 trunk/drivers/staging/hv/{ChannelMgmt.c => channel_mgmt.c} | 0
 trunk/drivers/staging/hv/{ChannelMgmt.h => channel_mgmt.h} | 0
 6 files changed, 4 insertions(+), 4 deletions(-)
 rename trunk/drivers/staging/hv/{ChannelMgmt.c => channel_mgmt.c} (100%)
 rename trunk/drivers/staging/hv/{ChannelMgmt.h => channel_mgmt.h} (100%)

diff --git a/[refs] b/[refs]
index 07ff40bb1305..16a327eaac8d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 043efcc31e78f4e61b2b8bc321bc9a3c498bf4d1
+refs/heads/master: ff39524bc463e63003d824d4106eda83762d648b
diff --git a/trunk/drivers/staging/hv/Makefile b/trunk/drivers/staging/hv/Makefile
index 685a3200e04e..2f9ecd2a85f1 100644
--- a/trunk/drivers/staging/hv/Makefile
+++ b/trunk/drivers/staging/hv/Makefile
@@ -6,7 +6,7 @@ obj-$(CONFIG_HYPERV_UTILS)	+= hv_utils.o
 
 hv_vmbus-objs := vmbus_drv.o osd.o \
 		 vmbus.o hv.o connection.o channel.o \
-		 ChannelMgmt.o ChannelInterface.o ring_buffer.o
+		 channel_mgmt.o ChannelInterface.o ring_buffer.o
 hv_storvsc-objs := storvsc_drv.o storvsc.o
 hv_blkvsc-objs := blkvsc_drv.o blkvsc.o
 hv_netvsc-objs := netvsc_drv.o netvsc.o rndis_filter.o
diff --git a/trunk/drivers/staging/hv/VmbusPrivate.h b/trunk/drivers/staging/hv/VmbusPrivate.h
index d73baff99a7e..6e82183e9d50 100644
--- a/trunk/drivers/staging/hv/VmbusPrivate.h
+++ b/trunk/drivers/staging/hv/VmbusPrivate.h
@@ -28,7 +28,7 @@
 #include "hv.h"
 #include "VmbusApi.h"
 #include "channel.h"
-#include "ChannelMgmt.h"
+#include "channel_mgmt.h"
 #include "ChannelInterface.h"
 #include "ring_buffer.h"
 #include <linux/list.h>
diff --git a/trunk/drivers/staging/hv/channel.h b/trunk/drivers/staging/hv/channel.h
index 6b283edcae68..acb2c556369b 100644
--- a/trunk/drivers/staging/hv/channel.h
+++ b/trunk/drivers/staging/hv/channel.h
@@ -25,7 +25,7 @@
 #ifndef _CHANNEL_H_
 #define _CHANNEL_H_
 
-#include "ChannelMgmt.h"
+#include "channel_mgmt.h"
 
 /* The format must be the same as struct vmdata_gpa_direct */
 struct VMBUS_CHANNEL_PACKET_PAGE_BUFFER {
diff --git a/trunk/drivers/staging/hv/ChannelMgmt.c b/trunk/drivers/staging/hv/channel_mgmt.c
similarity index 100%
rename from trunk/drivers/staging/hv/ChannelMgmt.c
rename to trunk/drivers/staging/hv/channel_mgmt.c
diff --git a/trunk/drivers/staging/hv/ChannelMgmt.h b/trunk/drivers/staging/hv/channel_mgmt.h
similarity index 100%
rename from trunk/drivers/staging/hv/ChannelMgmt.h
rename to trunk/drivers/staging/hv/channel_mgmt.h