Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq

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

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index e38d843a29156b8a69dc044781e3d1b887030f0c..a06e608789e390661e860605d6de3a29db0b7243 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
@@ -1896,6 +1903,14 @@ config SCSI_BFA_FC
          To compile this driver as a module, choose M here. The module will
          be called bfa.
 
+config SCSI_VIRTIO
+       tristate "virtio-scsi support (EXPERIMENTAL)"
+       depends on EXPERIMENTAL && VIRTIO
+       help
+          This is the virtual HBA driver for virtio.  If the kernel will
+          be used in a virtual machine, say Y or M.
+
+
 endif # SCSI_LOWLEVEL
 
 source "drivers/scsi/pcmcia/Kconfig"