diff options
author | K. Y. Srinivasan <kys@microsoft.com> | 2012-02-09 17:14:48 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-13 14:35:20 -0500 |
commit | 89ae7d709357df3a60e81c57613859d91d093ace (patch) | |
tree | 1bb00c35612ea48371380a9e9348a80c81c86dd7 /drivers/scsi/Makefile | |
parent | 0cbb613fa82fb09b6ef914ab0aaa92091f367bb6 (diff) |
Staging: hv: storvsc: Move the storage driver out of the staging area
The storage driver (storvsc_drv.c) handles all block storage devices
assigned to Linux guests hosted on Hyper-V. This driver has been in the
staging tree for a while and this patch moves it out of the staging area.
James was willing to apply this patch during the 3.3-rc phase and a decision
was taken to defer this to 3.4 since Greg had queued up a bunch of storvsc
patches for 3.4. Now that Greg has applied all of the pending storvsc patches,
I am sending this patch to move this driver out of staging. Based on James'
recommendation, this patch gets rid of the unneeded files in the staging/hv
directory.
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Acked-by: James Bottomley <JBottomley@Parallels.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/scsi/Makefile')
-rw-r--r-- | drivers/scsi/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile index 2b887498be50..e4c1a69f8fab 100644 --- a/drivers/scsi/Makefile +++ b/drivers/scsi/Makefile | |||
@@ -142,6 +142,7 @@ obj-$(CONFIG_SCSI_BNX2_ISCSI) += libiscsi.o bnx2i/ | |||
142 | obj-$(CONFIG_BE2ISCSI) += libiscsi.o be2iscsi/ | 142 | obj-$(CONFIG_BE2ISCSI) += libiscsi.o be2iscsi/ |
143 | obj-$(CONFIG_SCSI_PMCRAID) += pmcraid.o | 143 | obj-$(CONFIG_SCSI_PMCRAID) += pmcraid.o |
144 | obj-$(CONFIG_VMWARE_PVSCSI) += vmw_pvscsi.o | 144 | obj-$(CONFIG_VMWARE_PVSCSI) += vmw_pvscsi.o |
145 | obj-$(CONFIG_HYPERV_STORAGE) += hv_storvsc.o | ||
145 | 146 | ||
146 | obj-$(CONFIG_ARM) += arm/ | 147 | obj-$(CONFIG_ARM) += arm/ |
147 | 148 | ||
@@ -170,6 +171,8 @@ scsi_mod-$(CONFIG_SCSI_PROC_FS) += scsi_proc.o | |||
170 | scsi_mod-y += scsi_trace.o | 171 | scsi_mod-y += scsi_trace.o |
171 | scsi_mod-$(CONFIG_PM) += scsi_pm.o | 172 | scsi_mod-$(CONFIG_PM) += scsi_pm.o |
172 | 173 | ||
174 | hv_storvsc-y := storvsc_drv.o | ||
175 | |||
173 | scsi_tgt-y += scsi_tgt_lib.o scsi_tgt_if.o | 176 | scsi_tgt-y += scsi_tgt_lib.o scsi_tgt_if.o |
174 | 177 | ||
175 | sd_mod-objs := sd.o | 178 | sd_mod-objs := sd.o |