diff options
author | James Bottomley <JBottomley@Parallels.com> | 2011-07-23 19:09:03 +0200 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2011-07-23 19:09:03 +0200 |
commit | 87045b033a62777337ae4aa62834876da09b5fb5 (patch) | |
tree | 26aefd28e436668ff906e42b1e0d75c056e33e01 /drivers/scsi/Kconfig | |
parent | [SCSI] bnx2i: Fixed kernel panic due to illegal usage of sc->request->cpu (diff) | |
parent | [SCSI] fix crash in scsi_dispatch_cmd() (diff) | |
download | linux-87045b033a62777337ae4aa62834876da09b5fb5.tar.xz linux-87045b033a62777337ae4aa62834876da09b5fb5.zip |
Merge branch 'scsi-fixes'
Diffstat (limited to 'drivers/scsi/Kconfig')
-rw-r--r-- | drivers/scsi/Kconfig | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index 4a1f029c4fe9..8d9dae89f065 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig @@ -830,6 +830,19 @@ config SCSI_GDTH To compile this driver as a module, choose M here: the module will be called gdth. +config SCSI_ISCI + tristate "Intel(R) C600 Series Chipset SAS Controller" + depends on PCI && SCSI + depends on X86 + # (temporary): known alpha quality driver + depends on EXPERIMENTAL + select SCSI_SAS_LIBSAS + ---help--- + This driver supports the 6Gb/s SAS capabilities of the storage + control unit found in the Intel(R) C600 series chipset. + + The experimental tag will be removed after the driver exits alpha + config SCSI_GENERIC_NCR5380 tristate "Generic NCR5380/53c400 SCSI PIO support" depends on ISA && SCSI |