---

yaml --- r: 289083 b: refs/heads/master c: 89ae7d7 h: refs/heads/master i: 289081: 725c3ae 289079: 2c21627 v: v3
git-mirror · Feb 13, 2012 · 037beaa · 037beaa
1 parent a716bb7
commit 037beaa
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 17 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0cbb613fa82fb09b6ef914ab0aaa92091f367bb6
+refs/heads/master: 89ae7d709357df3a60e81c57613859d91d093ace
diff --git a/trunk/drivers/scsi/Kconfig b/trunk/drivers/scsi/Kconfig
@@ -662,6 +662,13 @@ config VMWARE_PVSCSI
 	  To compile this driver as a module, choose M here: the
 	  module will be called vmw_pvscsi.
 
+config HYPERV_STORAGE
+	tristate "Microsoft Hyper-V virtual storage driver"
+	depends on SCSI && HYPERV
+	default HYPERV
+	help
+	  Select this option to enable the Hyper-V virtual storage driver.
+
 config LIBFC
 	tristate "LibFC module"
 	select SCSI_FC_ATTRS

diff --git a/trunk/drivers/scsi/Makefile b/trunk/drivers/scsi/Makefile
@@ -142,6 +142,7 @@ obj-$(CONFIG_SCSI_BNX2_ISCSI)	+= libiscsi.o bnx2i/
 obj-$(CONFIG_BE2ISCSI)		+= libiscsi.o be2iscsi/
 obj-$(CONFIG_SCSI_PMCRAID)	+= pmcraid.o
 obj-$(CONFIG_VMWARE_PVSCSI)	+= vmw_pvscsi.o
+obj-$(CONFIG_HYPERV_STORAGE)	+= hv_storvsc.o
 
 obj-$(CONFIG_ARM)		+= arm/
 
@@ -170,6 +171,8 @@ scsi_mod-$(CONFIG_SCSI_PROC_FS)	+= scsi_proc.o
 scsi_mod-y			+= scsi_trace.o
 scsi_mod-$(CONFIG_PM)		+= scsi_pm.o
 
+hv_storvsc-y			:= storvsc_drv.o
+
 scsi_tgt-y			+= scsi_tgt_lib.o scsi_tgt_if.o
 
 sd_mod-objs	:= sd.o

diff --git a/trunk/drivers/staging/hv/storvsc_drv.c → trunk/drivers/scsi/storvsc_drv.c b/trunk/drivers/staging/hv/storvsc_drv.c → trunk/drivers/scsi/storvsc_drv.c
diff --git a/trunk/drivers/staging/Kconfig b/trunk/drivers/staging/Kconfig
@@ -76,8 +76,6 @@ source "drivers/staging/vt6655/Kconfig"
 
 source "drivers/staging/vt6656/Kconfig"
 
-source "drivers/staging/hv/Kconfig"
-
 source "drivers/staging/vme/Kconfig"
 
 source "drivers/staging/sep/Kconfig"

diff --git a/trunk/drivers/staging/Makefile b/trunk/drivers/staging/Makefile
@@ -29,7 +29,6 @@ obj-$(CONFIG_USB_SERIAL_QUATECH_USB2)	+= quatech_usb2/
 obj-$(CONFIG_OCTEON_ETHERNET)	+= octeon/
 obj-$(CONFIG_VT6655)		+= vt6655/
 obj-$(CONFIG_VT6656)		+= vt6656/
-obj-$(CONFIG_HYPERV)		+= hv/
 obj-$(CONFIG_VME_BUS)		+= vme/
 obj-$(CONFIG_DX_SEP)            += sep/
 obj-$(CONFIG_IIO)		+= iio/

diff --git a/trunk/drivers/staging/hv/Kconfig b/trunk/drivers/staging/hv/Kconfig
diff --git a/trunk/drivers/staging/hv/Makefile b/trunk/drivers/staging/hv/Makefile
diff --git a/trunk/drivers/staging/hv/TODO b/trunk/drivers/staging/hv/TODO