Merge branch 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[~andy/linux] / drivers / scsi / Kconfig

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 16570aa84aac0e1e420a541d7224ecfd0e567bbc..4e89103204dce7b4178e80fd2578b2b2d13f20d3 100644 (file)
--- a/drivers/scsi/Kconfig
+++ b/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
@@ -967,9 +974,8 @@ config SCSI_IPS
 
 config SCSI_IBMVSCSI
        tristate "IBM Virtual SCSI support"
-       depends on PPC_PSERIES || PPC_ISERIES
+       depends on PPC_PSERIES
        select SCSI_SRP_ATTRS
-       select VIOPATH if PPC_ISERIES
        help
          This is the IBM POWER Virtual SCSI Client