Staging: hv: Include asm/hyperv.h in hyperv.h

As the entries in hv_api.h are already in asm/hyperv.h, let's use that
file instead and delete these.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 10 insertions, 11 deletions

diff --git a/drivers/staging/hv/hyperv.h b/drivers/staging/hv/hyperv.h
index 630b852..56af1ec 100644
--- a/drivers/staging/hv/hyperv.h
+++ b/drivers/staging/hv/hyperv.h
@@ -25,6 +25,16 @@
 #ifndef _HYPERV_H
 #define _HYPERV_H
 
+#include <linux/scatterlist.h>
+#include <linux/list.h>
+#include <linux/timer.h>
+#include <linux/workqueue.h>
+#include <linux/completion.h>
+#include <linux/device.h>
+
+
+#include <asm/hyperv.h>
+
 struct hv_guid {
 	unsigned char data[16];
 };
@@ -319,12 +329,6 @@ enum vmbus_packet_type {
 #define VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED	1
 
 
-#include <linux/list.h>
-#include <linux/timer.h>
-#include <linux/workqueue.h>
-#include <linux/completion.h>
-#include "hyperv.h"
-
 /* Version 1 messages */
 enum vmbus_channel_message_type {
 	CHANNELMSG_INVALID			=  0,
@@ -759,9 +763,6 @@ extern unsigned int vmbus_loglevel;
 
 
 
-#include <linux/device.h>
-#include <linux/workqueue.h>
-
 struct hv_driver;
 struct hv_device;
 
@@ -822,8 +823,6 @@ struct hv_device {
 	void *ext;
 };
 
-#include <linux/device.h>
-
 
 static inline struct hv_device *device_to_hv_device(struct device *d)
 {