Merge /spare/repo/linux-2.6/

diff --combined drivers/scsi/Kconfig
index 939d3442c13a1178ace959b70f303ee36a4268da,f1e8c4223ed1d2f11d1ee3485875502cf9bf2629..4955167a7a92e9e8ec61005ea5e8663b87a652b4
--- 1/drivers/scsi/Kconfig
--- 2/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@@ -424,7 -424,7 +424,7 @@@ config SCSI_IN200
  source "drivers/scsi/megaraid/Kconfig.megaraid"
  
  config SCSI_SATA
-       bool "Serial ATA (SATA) support"
+       tristate "Serial ATA (SATA) support"
        depends on SCSI
        help
          This driver family supports Serial ATA host controllers
@@@ -499,14 -499,6 +499,14 @@@ config SCSI_SATA_SI
  
          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