diff options
Diffstat (limited to 'drivers/staging/hv')
25 files changed, 16 insertions, 19 deletions
diff --git a/drivers/staging/hv/BlkVsc.c b/drivers/staging/hv/BlkVsc.c index 526a0ab8997..c2e03673cf1 100644 --- a/drivers/staging/hv/BlkVsc.c +++ b/drivers/staging/hv/BlkVsc.c @@ -22,6 +22,7 @@ #include <linux/kernel.h> #include <linux/mm.h> +#include "osd.h" #include "StorVsc.c" static const char* gBlkDriverName="blkvsc"; diff --git a/drivers/staging/hv/Channel.c b/drivers/staging/hv/Channel.c index 78850f3a32c..5f4016154e8 100644 --- a/drivers/staging/hv/Channel.c +++ b/drivers/staging/hv/Channel.c @@ -23,7 +23,7 @@ #include <linux/kernel.h> #include <linux/mm.h> -#include "include/osd.h" +#include "osd.h" #include "include/logging.h" #include "VmbusPrivate.h" diff --git a/drivers/staging/hv/Channel.h b/drivers/staging/hv/Channel.h index c741dc1373f..d0fd9aa6238 100644 --- a/drivers/staging/hv/Channel.h +++ b/drivers/staging/hv/Channel.h @@ -25,7 +25,6 @@ #ifndef _CHANNEL_H_ #define _CHANNEL_H_ -#include "include/osd.h" #include "ChannelMgmt.h" /* The format must be the same as VMDATA_GPA_DIRECT */ diff --git a/drivers/staging/hv/ChannelInterface.c b/drivers/staging/hv/ChannelInterface.c index 451a1a53065..ffd62bb2914 100644 --- a/drivers/staging/hv/ChannelInterface.c +++ b/drivers/staging/hv/ChannelInterface.c @@ -23,8 +23,7 @@ #include <linux/kernel.h> #include <linux/mm.h> -#include "include/osd.h" - +#include "osd.h" #include "VmbusPrivate.h" static int diff --git a/drivers/staging/hv/ChannelMgmt.c b/drivers/staging/hv/ChannelMgmt.c index ebf4f7e8847..86ce05b4b14 100644 --- a/drivers/staging/hv/ChannelMgmt.c +++ b/drivers/staging/hv/ChannelMgmt.c @@ -24,7 +24,7 @@ #include <linux/kernel.h> #include <linux/mm.h> -#include "include/osd.h" +#include "osd.h" #include "include/logging.h" #include "VmbusPrivate.h" diff --git a/drivers/staging/hv/ChannelMgmt.h b/drivers/staging/hv/ChannelMgmt.h index 8b81d59b69d..34eddab6f3b 100644 --- a/drivers/staging/hv/ChannelMgmt.h +++ b/drivers/staging/hv/ChannelMgmt.h @@ -25,7 +25,6 @@ #ifndef _CHANNEL_MGMT_H_ #define _CHANNEL_MGMT_H_ -#include "include/osd.h" #include "include/List.h" #include "RingBuffer.h" diff --git a/drivers/staging/hv/Connection.c b/drivers/staging/hv/Connection.c index 6b726894b31..9083f33a4b3 100644 --- a/drivers/staging/hv/Connection.c +++ b/drivers/staging/hv/Connection.c @@ -25,6 +25,7 @@ #include <linux/kernel.h> #include <linux/mm.h> #include <linux/vmalloc.h> +#include "osd.h" #include "include/logging.h" #include "VmbusPrivate.h" diff --git a/drivers/staging/hv/Hv.c b/drivers/staging/hv/Hv.c index f706ab8f08c..31459f76f16 100644 --- a/drivers/staging/hv/Hv.c +++ b/drivers/staging/hv/Hv.c @@ -24,6 +24,7 @@ #include <linux/kernel.h> #include <linux/mm.h> #include <linux/vmalloc.h> +#include "osd.h" #include "include/logging.h" #include "VmbusPrivate.h" diff --git a/drivers/staging/hv/Hv.h b/drivers/staging/hv/Hv.h index 926213538cd..6df388d741a 100644 --- a/drivers/staging/hv/Hv.h +++ b/drivers/staging/hv/Hv.h @@ -25,8 +25,6 @@ #ifndef __HV_H__ #define __HV_H__ -#include "include/osd.h" - #include "include/HvTypes.h" #include "include/HvStatus.h" #include "include/HvHalApi.h" diff --git a/drivers/staging/hv/NetVsc.c b/drivers/staging/hv/NetVsc.c index 349329aea16..0389ef7bedb 100644 --- a/drivers/staging/hv/NetVsc.c +++ b/drivers/staging/hv/NetVsc.c @@ -24,6 +24,7 @@ #include <linux/mm.h> #include <linux/delay.h> #include <asm/io.h> +#include "osd.h" #include "include/logging.h" #include "NetVsc.h" #include "RndisFilter.h" diff --git a/drivers/staging/hv/RingBuffer.c b/drivers/staging/hv/RingBuffer.c index f7332f300c4..7473f915403 100644 --- a/drivers/staging/hv/RingBuffer.c +++ b/drivers/staging/hv/RingBuffer.c @@ -23,6 +23,7 @@ #include <linux/kernel.h> #include <linux/mm.h> +#include "osd.h" #include "include/logging.h" #include "RingBuffer.h" diff --git a/drivers/staging/hv/RingBuffer.h b/drivers/staging/hv/RingBuffer.h index 17e859fa510..6202157e145 100644 --- a/drivers/staging/hv/RingBuffer.h +++ b/drivers/staging/hv/RingBuffer.h @@ -27,8 +27,6 @@ #include <linux/scatterlist.h> -#include "include/osd.h" - typedef struct _RING_BUFFER { /* Offset in bytes from the start of ring data below */ volatile u32 WriteIndex; diff --git a/drivers/staging/hv/RndisFilter.c b/drivers/staging/hv/RndisFilter.c index 5cd1575578a..ef490f52593 100644 --- a/drivers/staging/hv/RndisFilter.c +++ b/drivers/staging/hv/RndisFilter.c @@ -26,8 +26,8 @@ #include <asm/kmap_types.h> #include <asm/io.h> +#include "osd.h" #include "include/logging.h" - #include "include/NetVscApi.h" #include "RndisFilter.h" diff --git a/drivers/staging/hv/RndisFilter.h b/drivers/staging/hv/RndisFilter.h index 6725fe525d3..8e357c8c95d 100644 --- a/drivers/staging/hv/RndisFilter.h +++ b/drivers/staging/hv/RndisFilter.h @@ -27,7 +27,6 @@ #define __struct_bcount(x) -#include "include/osd.h" #include "NetVsc.h" #include "include/rndis.h" diff --git a/drivers/staging/hv/StorVsc.c b/drivers/staging/hv/StorVsc.c index 47de70b0d82..32fa2914f45 100644 --- a/drivers/staging/hv/StorVsc.c +++ b/drivers/staging/hv/StorVsc.c @@ -25,8 +25,8 @@ #include <linux/string.h> #include <linux/mm.h> #include <linux/delay.h> +#include "osd.h" #include "include/logging.h" - #include "include/StorVscApi.h" #include "include/VmbusPacketFormat.h" #include "include/vstorage.h" diff --git a/drivers/staging/hv/Vmbus.c b/drivers/staging/hv/Vmbus.c index 50d2773053b..2feb7c3cfae 100644 --- a/drivers/staging/hv/Vmbus.c +++ b/drivers/staging/hv/Vmbus.c @@ -23,6 +23,7 @@ #include <linux/kernel.h> #include <linux/mm.h> +#include "osd.h" #include "include/logging.h" #include "VersionInfo.h" #include "VmbusPrivate.h" diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c index 6888909c69e..3107f460d9d 100644 --- a/drivers/staging/hv/blkvsc_drv.c +++ b/drivers/staging/hv/blkvsc_drv.c @@ -33,6 +33,7 @@ #include <scsi/scsi_eh.h> #include <scsi/scsi_dbg.h> +#include "osd.h" #include "include/logging.h" #include "include/vmbus.h" diff --git a/drivers/staging/hv/include/List.h b/drivers/staging/hv/include/List.h index 31c12969643..3895c328ddd 100644 --- a/drivers/staging/hv/include/List.h +++ b/drivers/staging/hv/include/List.h @@ -25,7 +25,6 @@ #ifndef _LIST_H_ #define _LIST_H_ -#include "osd.h" /* * * Doubly-linked list manipulation routines. Implemented as macros diff --git a/drivers/staging/hv/include/VmbusApi.h b/drivers/staging/hv/include/VmbusApi.h index 0a870855028..442a2125470 100644 --- a/drivers/staging/hv/include/VmbusApi.h +++ b/drivers/staging/hv/include/VmbusApi.h @@ -25,7 +25,6 @@ #ifndef _VMBUS_API_H_ #define _VMBUS_API_H_ -#include "osd.h" /* Defines */ diff --git a/drivers/staging/hv/include/logging.h b/drivers/staging/hv/include/logging.h index 8609269ca19..74c18f1d7f4 100644 --- a/drivers/staging/hv/include/logging.h +++ b/drivers/staging/hv/include/logging.h @@ -28,7 +28,6 @@ /* #include <linux/init.h> */ /* #include <linux/module.h> */ -#include "osd.h" #define VMBUS 0x0001 #define STORVSC 0x0002 diff --git a/drivers/staging/hv/netvsc_drv.c b/drivers/staging/hv/netvsc_drv.c index 439c357c52e..43488504a02 100644 --- a/drivers/staging/hv/netvsc_drv.c +++ b/drivers/staging/hv/netvsc_drv.c @@ -36,6 +36,7 @@ #include <net/sock.h> #include <net/pkt_sched.h> +#include "osd.h" #include "include/logging.h" #include "include/vmbus.h" diff --git a/drivers/staging/hv/osd.c b/drivers/staging/hv/osd.c index f2576958f64..3b142ce9661 100644 --- a/drivers/staging/hv/osd.c +++ b/drivers/staging/hv/osd.c @@ -43,7 +43,7 @@ #include <asm/kmap_types.h> #include <asm/atomic.h> -#include "include/osd.h" +#include "osd.h" /* Data types */ diff --git a/drivers/staging/hv/include/osd.h b/drivers/staging/hv/osd.h index 949c273e576..949c273e576 100644 --- a/drivers/staging/hv/include/osd.h +++ b/drivers/staging/hv/osd.h diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c index a79ea812bf4..fc5b02d5121 100644 --- a/drivers/staging/hv/storvsc_drv.c +++ b/drivers/staging/hv/storvsc_drv.c @@ -36,9 +36,9 @@ #include <scsi/scsi_dbg.h> +#include "osd.h" #include "include/logging.h" #include "include/vmbus.h" - #include "include/StorVscApi.h" diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c index 0e13d778c00..bb40c2e15c3 100644 --- a/drivers/staging/hv/vmbus_drv.c +++ b/drivers/staging/hv/vmbus_drv.c @@ -28,7 +28,7 @@ #include <linux/irq.h> #include <linux/interrupt.h> #include <linux/sysctl.h> - +#include "osd.h" #include "include/logging.h" #include "include/vmbus.h" |