Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc675230 authored by Jeff Garzik's avatar Jeff Garzik Committed by Linus Torvalds
Browse files

[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: default avatarJeff Garzik <jgarzik@pobox.com>
Signed-off-by: default avatarLinus torvalds <torvalds@osdl.org>
parent 47d6b083

drivers/pci/quirks.c

+2 −2
Original line number Diff line number Diff line
@@ -1233,7 +1233,7 @@ static void __init quirk_alder_ioapic(struct pci_dev *pdev) 
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL,	PCI_DEVICE_ID_INTEL_EESSC,	quirk_alder_ioapic );

#endif



#ifdef CONFIG_SCSI_SATA

#ifdef CONFIG_SCSI_SATA_INTEL_COMBINED

static void __devinit quirk_intel_ide_combined(struct pci_dev *pdev)

{

	u8 prog, comb, tmp;
@@ -1310,7 +1310,7 @@ static void __devinit quirk_intel_ide_combined(struct pci_dev *pdev) 
		request_region(0x170, 8, "libata");	/* port 1 */

}

DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,    PCI_ANY_ID,	  quirk_intel_ide_combined );

#endif /* CONFIG_SCSI_SATA */

#endif /* CONFIG_SCSI_SATA_INTEL_COMBINED */





int pcie_mch_quirk;

drivers/scsi/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -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