diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-10-19 07:13:58 -0400 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-10-19 07:13:58 -0400 |
| commit | e087a412b45543a87497f0a213dbd5d55099f267 (patch) | |
| tree | 8892cc84dbee2b4387c9f2604a7892b6ef3aab25 /drivers/scsi/Kconfig | |
| parent | 7946ada30bc45546cefc85809ba0fd07879eff52 (diff) | |
| parent | bb7e257ef8d8ba43cab356aa1cc1b20d0106d45f (diff) | |
Merge branch 'master' of /usr/src/ntfs-2.6/
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 20019b82b4a8..3ee9b8b33be0 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig | |||
| @@ -553,6 +553,11 @@ config SCSI_SATA_VITESSE | |||
| 553 | 553 | ||
| 554 | If unsure, say N. | 554 | If unsure, say N. |
| 555 | 555 | ||
| 556 | config SCSI_SATA_INTEL_COMBINED | ||
| 557 | bool | ||
| 558 | depends on IDE=y && !BLK_DEV_IDE_SATA && (SCSI_SATA_AHCI || SCSI_ATA_PIIX) | ||
| 559 | default y | ||
| 560 | |||
| 556 | config SCSI_BUSLOGIC | 561 | config SCSI_BUSLOGIC |
| 557 | tristate "BusLogic SCSI support" | 562 | tristate "BusLogic SCSI support" |
| 558 | depends on (PCI || ISA || MCA) && SCSI && ISA_DMA_API | 563 | depends on (PCI || ISA || MCA) && SCSI && ISA_DMA_API |