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

Commit 77967052 authored by Tejun Heo's avatar Tejun Heo Committed by Jeff Garzik
Browse files

[PATCH] libata: s/CONFIG_SCSI_SATA/CONFIG_[S]ATA/g in pci/quirks.c 



drivers/pci/quirks.c was not updated when libata config constants were
renamed braking several libata quirks.  Fix it.

Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 499792ec

drivers/pci/quirks.c

+3 −3
Original line number Diff line number Diff line
@@ -1209,7 +1209,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_962, quirk_sis_96x_ 
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI,	PCI_DEVICE_ID_SI_963,		quirk_sis_96x_smbus );

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI,	PCI_DEVICE_ID_SI_LPC,		quirk_sis_96x_smbus );



#if defined(CONFIG_SCSI_SATA) || defined(CONFIG_SCSI_SATA_MODULE)

#if defined(CONFIG_ATA) || defined(CONFIG_ATA_MODULE)



/*

 *	If we are using libata we can drive this chip properly but must
@@ -1299,7 +1299,7 @@ static int __init combined_setup(char *str) 
}

__setup("combined_mode=", combined_setup);



#ifdef CONFIG_SCSI_SATA_INTEL_COMBINED

#ifdef CONFIG_SATA_INTEL_COMBINED

static void __devinit quirk_intel_ide_combined(struct pci_dev *pdev)

{

	u8 prog, comb, tmp;
@@ -1392,7 +1392,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_INTEL_COMBINED */

#endif /* CONFIG_SATA_INTEL_COMBINED */





int pcie_mch_quirk;