diff options
author | K. Y. Srinivasan <kys@microsoft.com> | 2011-05-12 19:34:27 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-05-17 12:27:02 -0700 |
commit | 8ff3e6fc58d796640bb21bf398487c42230734d2 (patch) | |
tree | dab57960f0a37432f91d7fbd775712ae0214937a /drivers/staging/hv/hyperv.h | |
parent | f9aea9fd2d03bd6b51a38d9866cf2b527966236c (diff) |
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>
Diffstat (limited to 'drivers/staging/hv/hyperv.h')
-rw-r--r-- | drivers/staging/hv/hyperv.h | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/drivers/staging/hv/hyperv.h b/drivers/staging/hv/hyperv.h index 630b8528f472..56af1ecbf0e5 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) { |