diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:39:55 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-08 05:39:55 -0400 |
commit | c324b44c34050cf2a9b58830e11c974806bd85d8 (patch) | |
tree | 3ac45a783221283925cd698334a8f5e7dd4c1df8 /drivers/scsi/Kconfig | |
parent | 2fcf522509cceea524b6e7ece8fd6759b682175a (diff) | |
parent | caf39e87cc1182f7dae84eefc43ca14d54c78ef9 (diff) |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/scsi/Kconfig')
-rw-r--r-- | drivers/scsi/Kconfig | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index 12c208fb18c5..2d21265e650b 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig | |||
@@ -1,5 +1,11 @@ | |||
1 | menu "SCSI device support" | 1 | menu "SCSI device support" |
2 | 2 | ||
3 | config RAID_ATTRS | ||
4 | tristate "RAID Transport Class" | ||
5 | default n | ||
6 | ---help--- | ||
7 | Provides RAID | ||
8 | |||
3 | config SCSI | 9 | config SCSI |
4 | tristate "SCSI device support" | 10 | tristate "SCSI device support" |
5 | ---help--- | 11 | ---help--- |
@@ -250,7 +256,7 @@ config SCSI_DECNCR | |||
250 | 256 | ||
251 | config SCSI_DECSII | 257 | config SCSI_DECSII |
252 | tristate "DEC SII Scsi Driver" | 258 | tristate "DEC SII Scsi Driver" |
253 | depends on MACH_DECSTATION && SCSI && MIPS32 | 259 | depends on MACH_DECSTATION && SCSI && 32BIT |
254 | 260 | ||
255 | config BLK_DEV_3W_XXXX_RAID | 261 | config BLK_DEV_3W_XXXX_RAID |
256 | tristate "3ware 5/6/7/8xxx ATA-RAID support" | 262 | tristate "3ware 5/6/7/8xxx ATA-RAID support" |
@@ -459,6 +465,15 @@ config SCSI_ATA_PIIX | |||
459 | 465 | ||
460 | If unsure, say N. | 466 | If unsure, say N. |
461 | 467 | ||
468 | config SCSI_SATA_MV | ||
469 | tristate "Marvell SATA support" | ||
470 | depends on SCSI_SATA && PCI && EXPERIMENTAL | ||
471 | help | ||
472 | This option enables support for the Marvell Serial ATA family. | ||
473 | Currently supports 88SX[56]0[48][01] chips. | ||
474 | |||
475 | If unsure, say N. | ||
476 | |||
462 | config SCSI_SATA_NV | 477 | config SCSI_SATA_NV |
463 | tristate "NVIDIA SATA support" | 478 | tristate "NVIDIA SATA support" |
464 | depends on SCSI_SATA && PCI && EXPERIMENTAL | 479 | depends on SCSI_SATA && PCI && EXPERIMENTAL |