diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-09 10:54:30 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-09 10:54:30 -0400 |
| commit | 3d3467f0fdf61a421361c00cf84fcf0f1a6dc1e8 (patch) | |
| tree | 9941b526bac21cb7445c75fe8edf995659c93780 /drivers/scsi/Kconfig | |
| parent | e710245bb0f980adfb1dfe850e43761a8117c6be (diff) | |
| parent | 042c21fd2c3aa553907020131caa553a9da24589 (diff) | |
Merge branch 'sil24'
Diffstat (limited to 'drivers/scsi/Kconfig')
| -rw-r--r-- | drivers/scsi/Kconfig | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index 20019b82b4a8..be96cb78e3b5 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig | |||
| @@ -521,6 +521,14 @@ config SCSI_SATA_SIL | |||
| 521 | 521 | ||
| 522 | If unsure, say N. | 522 | If unsure, say N. |
| 523 | 523 | ||
| 524 | config SCSI_SATA_SIL24 | ||
| 525 | tristate "Silicon Image 3124/3132 SATA support" | ||
| 526 | depends on SCSI_SATA && PCI && EXPERIMENTAL | ||
| 527 | help | ||
| 528 | This option enables support for Silicon Image 3124/3132 Serial ATA. | ||
| 529 | |||
| 530 | If unsure, say N. | ||
| 531 | |||
| 524 | config SCSI_SATA_SIS | 532 | config SCSI_SATA_SIS |
| 525 | tristate "SiS 964/180 SATA support" | 533 | tristate "SiS 964/180 SATA support" |
| 526 | depends on SCSI_SATA && PCI && EXPERIMENTAL | 534 | depends on SCSI_SATA && PCI && EXPERIMENTAL |