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

[mv-sheeva.git] / drivers / scsi / Kconfig

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 9c23122f755fdae9b2c9de8937abf5b22bd1ec4e..82bb3b2d207a08a3d94330114d40ae12d28bf4f7 100644 (file)
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -1811,6 +1811,12 @@ config ZFCP
           called zfcp. If you want to compile it as a module, say M here
           and read <file:Documentation/kbuild/modules.txt>.
 
+config SCSI_PMCRAID
+       tristate "PMC SIERRA Linux MaxRAID adapter support"
+       depends on PCI && SCSI
+       ---help---
+         This driver supports the PMC SIERRA MaxRAID adapters.
+
 config SCSI_SRP
        tristate "SCSI RDMA Protocol helper library"
        depends on SCSI && PCI