Merge tag 'pstore-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl...

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

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index d3d18e89cb5761dbca06245ff92dd7978d5690f2..a06e608789e390661e860605d6de3a29db0b7243 100644 (file)
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -974,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
 
@@ -1904,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"