Merge /spare/repo/linux-2.6/

[linux-2.6-omap-h63xx.git] / drivers / scsi / Kconfig

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 2d21265e650b2abc0d79bd1f2c50ef212d9b977b..10f3f4da68c53df08ea443e28c1a5641dd4c7fd4 100644 (file)
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -514,6 +514,14 @@ config SCSI_SATA_SIL
 
          If unsure, say N.
 
+config SCSI_SATA_SIL24
+       tristate "Silicon Image 3124/3132 SATA support"
+       depends on SCSI_SATA && PCI && EXPERIMENTAL
+       help
+         This option enables support for Silicon Image 3124/3132 Serial ATA.
+
+         If unsure, say N.
+
 config SCSI_SATA_SIS
        tristate "SiS 964/180 SATA support"
        depends on SCSI_SATA && PCI && EXPERIMENTAL