diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-18 17:16:06 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-18 17:16:06 -0400 |
| commit | 5a476deff3d17093da39c4eccb2692ba714dcb11 (patch) | |
| tree | 16f5c745a3c8ac780a218ad3d43e32f33164bcf5 /drivers/scsi/Kconfig | |
| parent | dd4efa44ebf2a8a0e5edf60a53eadec981b4b10a (diff) | |
| parent | 39ca371c45b04cd50d0974030ae051906fc516b6 (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/scsi/Kconfig')
| -rw-r--r-- | drivers/scsi/Kconfig | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index e2845b44277..9c9f162bd6e 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig | |||
| @@ -569,6 +569,11 @@ config SCSI_SATA_VITESSE | |||
| 569 | 569 | ||
| 570 | If unsure, say N. | 570 | If unsure, say N. |
| 571 | 571 | ||
| 572 | config SCSI_SATA_INTEL_COMBINED | ||
| 573 | bool | ||
| 574 | depends on IDE=y && !BLK_DEV_IDE_SATA && (SCSI_SATA_AHCI || SCSI_ATA_PIIX) | ||
| 575 | default y | ||
| 576 | |||
| 572 | config SCSI_BUSLOGIC | 577 | config SCSI_BUSLOGIC |
| 573 | tristate "BusLogic SCSI support" | 578 | tristate "BusLogic SCSI support" |
| 574 | depends on (PCI || ISA || MCA) && SCSI && ISA_DMA_API | 579 | depends on (PCI || ISA || MCA) && SCSI && ISA_DMA_API |