diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 17:27:39 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 17:27:39 -0700 |
| commit | cc896f08717c445235554a7963a7b2ecf58911ad (patch) | |
| tree | 1f3bdd0d1b7b503e2344755ff03e0862c8eb9a01 /drivers/scsi/Kconfig | |
| parent | 87129d96265cebcb1176896746d285b46c2d7b36 (diff) | |
| parent | ca20aa6954bcb4537064a1bf5e8f74af57da2a03 (diff) | |
Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
Diffstat (limited to 'drivers/scsi/Kconfig')
| -rw-r--r-- | drivers/scsi/Kconfig | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index 787ad00a2b73..a261b9eea139 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig @@ -459,6 +459,15 @@ config SCSI_ATA_PIIX If unsure, say N. +config SCSI_SATA_MV + tristate "Marvell SATA support" + depends on SCSI_SATA && PCI && EXPERIMENTAL + help + This option enables support for the Marvell Serial ATA family. + Currently supports 88SX[56]0[48][01] chips. + + If unsure, say N. + config SCSI_SATA_NV tristate "NVIDIA SATA support" depends on SCSI_SATA && PCI && EXPERIMENTAL |