---

yaml
---
r: 249615
b: refs/heads/master
c: 3f335ea
h: refs/heads/master
i:
  249613: 01c46e2
  249611: d964862
  249607: c1eebf4
  249599: c8671a1
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5c47340061ff722c7b743fbb8e7793019ab5f10a
+refs/heads/master: 3f335ea2131b14bca2333b4316c8d4dd737e30db

trunk/drivers/staging/hv/blkvsc_drv.c

@@ -31,6 +31,8 @@
 #include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_eh.h>
 #include <scsi/scsi_dbg.h>
+
+#include "hyperv.h"
 #include "hv_api.h"
 #include "logging.h"
 #include "version_info.h"

trunk/drivers/staging/hv/channel.c

@@ -26,6 +26,8 @@
 #include <linux/mm.h>
 #include <linux/slab.h>
 #include <linux/module.h>
+
+#include "hyperv.h"
 #include "hv_api.h"
 #include "logging.h"
 #include "vmbus_private.h"

trunk/drivers/staging/hv/channel_mgmt.c

@@ -28,6 +28,8 @@
 #include <linux/list.h>
 #include <linux/module.h>
 #include <linux/completion.h>
+
+#include "hyperv.h"
 #include "hv_api.h"
 #include "logging.h"
 #include "vmbus_private.h"

trunk/drivers/staging/hv/connection.c

@@ -28,6 +28,8 @@
 #include <linux/mm.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
+
+#include "hyperv.h"
 #include "hv_api.h"
 #include "logging.h"
 #include "vmbus_private.h"

trunk/drivers/staging/hv/hv.c

@@ -25,6 +25,8 @@
 #include <linux/mm.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
+
+#include "hyperv.h"
 #include "hv_api.h"
 #include "logging.h"
 #include "vmbus_private.h"

trunk/drivers/staging/hv/hv_api.h

@@ -23,11 +23,6 @@
 #ifndef __HV_API_H
 #define __HV_API_H
 
-struct hv_guid {
-	unsigned char data[16];
-};
-
-
 
 /* Status codes for hypervisor operations. */
 

trunk/drivers/staging/hv/hv_kvp.c

@@ -27,6 +27,7 @@
 #include <linux/connector.h>
 #include <linux/workqueue.h>
 
+#include "hyperv.h"
 #include "logging.h"
 #include "hv_api.h"
 #include "vmbus.h"

trunk/drivers/staging/hv/hv_mouse.c

@@ -26,6 +26,7 @@
 #include <linux/dmi.h>
 #include <linux/delay.h>
 
+#include "hyperv.h"
 #include "hv_api.h"
 #include "logging.h"
 #include "version_info.h"

trunk/drivers/staging/hv/hv_util.c

@@ -29,6 +29,7 @@
 #include <linux/dmi.h>
 #include <linux/pci.h>
 
+#include "hyperv.h"
 #include "logging.h"
 #include "hv_api.h"
 #include "vmbus.h"

trunk/drivers/staging/hv/hyperv.h

@@ -21,3 +21,13 @@
  *   K. Y. Srinivasan <kys@microsoft.com>
  *
  */
+
+#ifndef _HYPERV_H
+#define _HYPERV_H
+
+struct hv_guid {
+	unsigned char data[16];
+};
+
+
+#endif /* _HYPERV_H */

trunk/drivers/staging/hv/netvsc.c

@@ -27,6 +27,8 @@
 #include <linux/delay.h>
 #include <linux/io.h>
 #include <linux/slab.h>
+
+#include "hyperv.h"
 #include "hv_api.h"
 #include "logging.h"
 #include "netvsc.h"

trunk/drivers/staging/hv/netvsc_drv.c

@@ -38,6 +38,8 @@
 #include <net/route.h>
 #include <net/sock.h>
 #include <net/pkt_sched.h>
+
+#include "hyperv.h"
 #include "hv_api.h"
 #include "logging.h"
 #include "version_info.h"

trunk/drivers/staging/hv/ring_buffer.c

@@ -25,6 +25,8 @@
 
 #include <linux/kernel.h>
 #include <linux/mm.h>
+
+#include "hyperv.h"
 #include "logging.h"
 #include "ring_buffer.h"
 

trunk/drivers/staging/hv/rndis_filter.c

@@ -26,6 +26,8 @@
 #include <linux/io.h>
 #include <linux/if_ether.h>
 #include <linux/netdevice.h>
+
+#include "hyperv.h"
 #include "logging.h"
 #include "hv_api.h"
 #include "netvsc_api.h"

trunk/drivers/staging/hv/storvsc.c

@@ -27,6 +27,8 @@
 #include <linux/slab.h>
 #include <linux/mm.h>
 #include <linux/delay.h>
+
+#include "hyperv.h"
 #include "hv_api.h"
 #include "logging.h"
 #include "storvsc_api.h"

trunk/drivers/staging/hv/storvsc_drv.c

@@ -32,6 +32,8 @@
 #include <scsi/scsi_eh.h>
 #include <scsi/scsi_devinfo.h>
 #include <scsi/scsi_dbg.h>
+
+#include "hyperv.h"
 #include "hv_api.h"
 #include "logging.h"
 #include "version_info.h"

trunk/drivers/staging/hv/vmbus_drv.c

@@ -34,6 +34,8 @@
 #include <linux/acpi.h>
 #include <acpi/acpi_bus.h>
 #include <linux/completion.h>
+
+#include "hyperv.h"
 #include "version_info.h"
 #include "hv_api.h"
 #include "logging.h"