sugar/linux
1
0
Fork 0
Code Activity

[PATCH] Fix and clean up quirk_intel_ide_combined() configuration

Browse Source 
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>
This commit is contained in:
Jeff Garzik
2005-10-17 13:01:57 -04:00
committed by Linus Torvalds
parent 47d6b08334
commit cc675230a9
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/scsi/Kconfig
View File

@@ -553,6 +553,11 @@ config SCSI_SATA_VITESSE
If unsure, say N.
config SCSI_SATA_INTEL_COMBINED
bool
depends on IDE=y && !BLK_DEV_IDE_SATA && (SCSI_SATA_AHCI || SCSI_ATA_PIIX)
default y
config SCSI_BUSLOGIC
tristate "BusLogic SCSI support"
depends on (PCI || ISA || MCA) && SCSI && ISA_DMA_API