diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-17 13:01:57 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-17 18:01:53 -0400 |
| commit | cc675230a9ca17010694bc8bd3c69ca9adf2efef (patch) | |
| tree | 338784dc40e0a3ec5f96f5a76c267846ad2f5e8d /drivers/scsi | |
| parent | 47d6b08334a43fafa61a587f721fa21ef65d81be (diff) | |
[PATCH] Fix and clean up quirk_intel_ide_combined() configuration
This change makes quirk_intel_ide_combined() dependent on the precise
conditions under which it is needed:
* IDE is built in
* IDE SATA option is not set
* ata_piix or ahci drivers are enabled
This fixes an issue where some modular configurations would not cause
the quirk to be enabled.
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Signed-off-by: Linus torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/scsi')
| -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 |