View | Details | Raw Unified | Return to bug 217930
Collapse All | Expand All

(-)a/drivers/pci/quirks.c (-4 / +3 lines)
Lines 1209-1215 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_S Link Here
1209
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI,	PCI_DEVICE_ID_SI_963,		quirk_sis_96x_smbus );
1209
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI,	PCI_DEVICE_ID_SI_963,		quirk_sis_96x_smbus );
1210
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI,	PCI_DEVICE_ID_SI_LPC,		quirk_sis_96x_smbus );
1210
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_SI,	PCI_DEVICE_ID_SI_LPC,		quirk_sis_96x_smbus );
1211
1211
1212
#if defined(CONFIG_SCSI_SATA) || defined(CONFIG_SCSI_SATA_MODULE)
1212
#if defined(CONFIG_ATA) || defined(CONFIG_ATA_MODULE)
1213
1213
1214
/*
1214
/*
1215
 *	If we are using libata we can drive this chip properly but must
1215
 *	If we are using libata we can drive this chip properly but must
Lines 1299-1305 static int __init combined_setup(char *s Link Here
1299
}
1299
}
1300
__setup("combined_mode=", combined_setup);
1300
__setup("combined_mode=", combined_setup);
1301
1301
1302
#ifdef CONFIG_SCSI_SATA_INTEL_COMBINED
1302
#ifdef CONFIG_SATA_INTEL_COMBINED
1303
static void __devinit quirk_intel_ide_combined(struct pci_dev *pdev)
1303
static void __devinit quirk_intel_ide_combined(struct pci_dev *pdev)
1304
{
1304
{
1305
	u8 prog, comb, tmp;
1305
	u8 prog, comb, tmp;
Lines 1392-1398 static void __devinit quirk_intel_ide_co Link Here
1392
		request_region(0x170, 8, "libata");	/* port 1 */
1392
		request_region(0x170, 8, "libata");	/* port 1 */
1393
}
1393
}
1394
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,    PCI_ANY_ID,	  quirk_intel_ide_combined );
1394
DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL,    PCI_ANY_ID,	  quirk_intel_ide_combined );
1395
#endif /* CONFIG_SCSI_SATA_INTEL_COMBINED */
1395
#endif /* CONFIG_SATA_INTEL_COMBINED */
1396
1396
1397
1397
1398
int pcie_mch_quirk;
1398
int pcie_mch_quirk;
1399
- 

Return to bug 217930