summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2011-10-11 08:36:44 -0600
committerGreg Kroah-Hartman <gregkh@suse.de>2011-10-11 08:49:19 -0600
commit407dd1644302ea78fa5d740e67a1c09677aa18a4 (patch)
tree3fe6bef5d17db41b02578a05cb1caef66af2355c
parent46a971913611a23478283931460a95be962ce329 (diff)
downloadblackbird-op-linux-407dd1644302ea78fa5d740e67a1c09677aa18a4.tar.gz
blackbird-op-linux-407dd1644302ea78fa5d740e67a1c09677aa18a4.zip
Staging: hv: remove unneeded asm include file in hyperv.h
No one outside of the hyperv core needs to include the asm/hyperv.h file, so don't put it in the "global" include/linux/hyperv.h file. Cc: K. Y. Srinivasan <kys@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/hv/connection.c2
-rw-r--r--drivers/hv/hv.c2
-rw-r--r--drivers/hv/vmbus_drv.c2
-rw-r--r--include/linux/hyperv.h3
4 files changed, 3 insertions, 6 deletions
diff --git a/drivers/hv/connection.c b/drivers/hv/connection.c
index 5f438b650068..650c9f0b6642 100644
--- a/drivers/hv/connection.c
+++ b/drivers/hv/connection.c
@@ -30,7 +30,7 @@
#include <linux/slab.h>
#include <linux/vmalloc.h>
#include <linux/hyperv.h>
-
+#include <asm/hyperv.h>
#include "hyperv_vmbus.h"
diff --git a/drivers/hv/hv.c b/drivers/hv/hv.c
index 931b7b030784..0fb100ed91a3 100644
--- a/drivers/hv/hv.c
+++ b/drivers/hv/hv.c
@@ -26,7 +26,7 @@
#include <linux/slab.h>
#include <linux/vmalloc.h>
#include <linux/hyperv.h>
-
+#include <asm/hyperv.h>
#include "hyperv_vmbus.h"
/* The one and only */
diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
index b0d08f980de1..bb9f20507d77 100644
--- a/drivers/hv/vmbus_drv.c
+++ b/drivers/hv/vmbus_drv.c
@@ -33,7 +33,7 @@
#include <acpi/acpi_bus.h>
#include <linux/completion.h>
#include <linux/hyperv.h>
-
+#include <asm/hyperv.h>
#include "hyperv_vmbus.h"
diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h
index edaa9e2f58ec..4c8414a8b07f 100644
--- a/include/linux/hyperv.h
+++ b/include/linux/hyperv.h
@@ -35,9 +35,6 @@
#include <linux/mod_devicetable.h>
-#include <asm/hyperv.h>
-
-
#define MAX_PAGE_BUFFER_COUNT 16
#define MAX_MULTIPAGE_BUFFER_COUNT 32 /* 128K */
OpenPOWER on IntegriCloud