From 113373f84419359a4b9484a00dbdf75fb9662ed5 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Mon, 17 Aug 2009 17:22:08 -0700
Subject: [PATCH] --- yaml --- r: 162199 b: refs/heads/master c:
 a0086dc512ba6c2161dcf48195daf177ad0c3615 h: refs/heads/master i:   162197:
 6c9e7e719433e4821ed307e3b4434220a6542c26   162195:
 a101318f91bc98d9d43ee5109d9158cbf5073869   162191:
 c1ccb5e6e9a39db98e752cd35960c6162d347ab0 v: v3

---
 [refs]                                      |  2 +-
 trunk/drivers/staging/hv/Channel.c          |  1 +
 trunk/drivers/staging/hv/ChannelInterface.c |  4 +++
 trunk/drivers/staging/hv/ChannelMgmt.c      |  2 ++
 trunk/drivers/staging/hv/Connection.c       |  4 ++-
 trunk/drivers/staging/hv/Hv.c               |  3 ++-
 trunk/drivers/staging/hv/Makefile           |  4 ++-
 trunk/drivers/staging/hv/RingBuffer.c       |  3 ++-
 trunk/drivers/staging/hv/Sources.c          | 30 ---------------------
 9 files changed, 18 insertions(+), 35 deletions(-)
 delete mode 100644 trunk/drivers/staging/hv/Sources.c

diff --git a/[refs] b/[refs]
index 6a4b7d58b672..71cdc767ac7b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3523a805fd2462e7df1c3601c25a7a8df2f8f6a9
+refs/heads/master: a0086dc512ba6c2161dcf48195daf177ad0c3615
diff --git a/trunk/drivers/staging/hv/Channel.c b/trunk/drivers/staging/hv/Channel.c
index 89ddbf1c83b2..a8398a216848 100644
--- a/trunk/drivers/staging/hv/Channel.c
+++ b/trunk/drivers/staging/hv/Channel.c
@@ -22,6 +22,7 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/mm.h>
 #include "include/osd.h"
 #include "include/logging.h"
 
diff --git a/trunk/drivers/staging/hv/ChannelInterface.c b/trunk/drivers/staging/hv/ChannelInterface.c
index 6a30691343a3..23a1e179ba1c 100644
--- a/trunk/drivers/staging/hv/ChannelInterface.c
+++ b/trunk/drivers/staging/hv/ChannelInterface.c
@@ -21,6 +21,10 @@
  *
  */
 
+#include <linux/kernel.h>
+#include <linux/mm.h>
+#include "include/osd.h"
+
 #include "VmbusPrivate.h"
 
 static int
diff --git a/trunk/drivers/staging/hv/ChannelMgmt.c b/trunk/drivers/staging/hv/ChannelMgmt.c
index 79770c84bddc..4680e14e6797 100644
--- a/trunk/drivers/staging/hv/ChannelMgmt.c
+++ b/trunk/drivers/staging/hv/ChannelMgmt.c
@@ -22,6 +22,8 @@
  */
 
 
+#include <linux/kernel.h>
+#include <linux/mm.h>
 #include "include/osd.h"
 #include "include/logging.h"
 
diff --git a/trunk/drivers/staging/hv/Connection.c b/trunk/drivers/staging/hv/Connection.c
index 0370a0b01a3f..01aa669006ae 100644
--- a/trunk/drivers/staging/hv/Connection.c
+++ b/trunk/drivers/staging/hv/Connection.c
@@ -22,8 +22,10 @@
  */
 
 
+#include <linux/kernel.h>
+#include <linux/mm.h>
+#include <linux/vmalloc.h>
 #include "include/logging.h"
-
 #include "VmbusPrivate.h"
 
 /* Globals */
diff --git a/trunk/drivers/staging/hv/Hv.c b/trunk/drivers/staging/hv/Hv.c
index 438bc2e42d39..c228e6053f65 100644
--- a/trunk/drivers/staging/hv/Hv.c
+++ b/trunk/drivers/staging/hv/Hv.c
@@ -21,8 +21,9 @@
  *
  */
 
+#include <linux/kernel.h>
+#include <linux/mm.h>
 #include <linux/vmalloc.h>
-#include <asm/io.h>
 #include "include/logging.h"
 #include "VmbusPrivate.h"
 
diff --git a/trunk/drivers/staging/hv/Makefile b/trunk/drivers/staging/hv/Makefile
index f6ad6707b2ce..27ebae8a9185 100644
--- a/trunk/drivers/staging/hv/Makefile
+++ b/trunk/drivers/staging/hv/Makefile
@@ -3,7 +3,9 @@ obj-$(CONFIG_HYPERV_STORAGE)	+= hv_storvsc.o
 obj-$(CONFIG_HYPERV_BLOCK)	+= hv_blkvsc.o
 obj-$(CONFIG_HYPERV_NET)	+= hv_netvsc.o
 
-hv_vmbus-objs := vmbus_drv.o osd.o Sources.o
+hv_vmbus-objs := vmbus_drv.o osd.o \
+		 Vmbus.o Hv.o Connection.o Channel.o \
+		 ChannelMgmt.o ChannelInterface.o RingBuffer.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 RndisFilter.o
diff --git a/trunk/drivers/staging/hv/RingBuffer.c b/trunk/drivers/staging/hv/RingBuffer.c
index 0ea6a0f4a22d..f7332f300c45 100644
--- a/trunk/drivers/staging/hv/RingBuffer.c
+++ b/trunk/drivers/staging/hv/RingBuffer.c
@@ -21,7 +21,8 @@
  *
  */
 
-
+#include <linux/kernel.h>
+#include <linux/mm.h>
 #include "include/logging.h"
 #include "RingBuffer.h"
 
diff --git a/trunk/drivers/staging/hv/Sources.c b/trunk/drivers/staging/hv/Sources.c
deleted file mode 100644
index 3db16a77e6b2..000000000000
--- a/trunk/drivers/staging/hv/Sources.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *
- * Copyright (c) 2009, Microsoft Corporation.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place - Suite 330, Boston, MA 02111-1307 USA.
- *
- * Authors:
- *   Haiyang Zhang <haiyangz@microsoft.com>
- *   Hank Janssen  <hjanssen@microsoft.com>
- *
- */
-
-#include "Vmbus.c"
-#include "Hv.c"
-#include "Connection.c"
-#include "Channel.c"
-#include "ChannelMgmt.c"
-#include "ChannelInterface.c"
-#include "RingBuffer.c"