From 6f83e5f869dc795e29e16c13b5935a017c671674 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Fri, 28 Aug 2009 16:24:48 -0700
Subject: [PATCH] --- yaml --- r: 162254 b: refs/heads/master c:
 216260d8b8225249a114494581ab387290102c1b h: refs/heads/master v: v3

---
 [refs]                                                     | 2 +-
 trunk/drivers/staging/hv/ChannelMgmt.h                     | 3 +--
 trunk/drivers/staging/hv/NetVsc.h                          | 2 +-
 trunk/drivers/staging/hv/StorVsc.c                         | 2 +-
 trunk/drivers/staging/hv/{include => }/VmbusPacketFormat.h | 0
 5 files changed, 4 insertions(+), 5 deletions(-)
 rename trunk/drivers/staging/hv/{include => }/VmbusPacketFormat.h (100%)

diff --git a/[refs] b/[refs]
index d0a28274d6a8..5a80904a5597 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0197e34c1b22f64bf6ac0f49160f8d6bf6fffb31
+refs/heads/master: 216260d8b8225249a114494581ab387290102c1b
diff --git a/trunk/drivers/staging/hv/ChannelMgmt.h b/trunk/drivers/staging/hv/ChannelMgmt.h
index 6d327c65d938..733ef8d45a35 100644
--- a/trunk/drivers/staging/hv/ChannelMgmt.h
+++ b/trunk/drivers/staging/hv/ChannelMgmt.h
@@ -27,9 +27,8 @@
 
 #include "List.h"
 #include "RingBuffer.h"
-
 #include "VmbusChannelInterface.h"
-#include "include/VmbusPacketFormat.h"
+#include "VmbusPacketFormat.h"
 
 /* Version 1 messages */
 enum vmbus_channel_message_type {
diff --git a/trunk/drivers/staging/hv/NetVsc.h b/trunk/drivers/staging/hv/NetVsc.h
index ce6f1e2daf62..73de16e9f13f 100644
--- a/trunk/drivers/staging/hv/NetVsc.h
+++ b/trunk/drivers/staging/hv/NetVsc.h
@@ -24,7 +24,7 @@
 #ifndef _NETVSC_H_
 #define _NETVSC_H_
 
-#include "include/VmbusPacketFormat.h"
+#include "VmbusPacketFormat.h"
 #include "VmbusChannelInterface.h"
 #include "List.h"
 #include "NetVscApi.h"
diff --git a/trunk/drivers/staging/hv/StorVsc.c b/trunk/drivers/staging/hv/StorVsc.c
index e78f9abe70e3..75b92a051c84 100644
--- a/trunk/drivers/staging/hv/StorVsc.c
+++ b/trunk/drivers/staging/hv/StorVsc.c
@@ -28,7 +28,7 @@
 #include "osd.h"
 #include "logging.h"
 #include "StorVscApi.h"
-#include "include/VmbusPacketFormat.h"
+#include "VmbusPacketFormat.h"
 #include "vstorage.h"
 
 
diff --git a/trunk/drivers/staging/hv/include/VmbusPacketFormat.h b/trunk/drivers/staging/hv/VmbusPacketFormat.h
similarity index 100%
rename from trunk/drivers/staging/hv/include/VmbusPacketFormat.h
rename to trunk/drivers/staging/hv/VmbusPacketFormat.h