From 048f1d681470258d99a404e5d4c5a4b49720c44d Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Mon, 17 Oct 2005 13:01:57 -0400 Subject: [PATCH] --- yaml --- r: 9913 b: refs/heads/master c: cc675230a9ca17010694bc8bd3c69ca9adf2efef h: refs/heads/master i: 9911: 87db5027252276292e94feb80125a581e7bc617d v: v3 --- [refs] | 2 +- trunk/drivers/pci/quirks.c | 4 ++-- trunk/drivers/scsi/Kconfig | 5 +++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ca93832946f1..7c5e9f5119f3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 47d6b08334a43fafa61a587f721fa21ef65d81be +refs/heads/master: cc675230a9ca17010694bc8bd3c69ca9adf2efef diff --git a/trunk/drivers/pci/quirks.c b/trunk/drivers/pci/quirks.c index 11ca44387cb0..a6a630a950d0 100644 --- a/trunk/drivers/pci/quirks.c +++ b/trunk/drivers/pci/quirks.c @@ -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; diff --git a/trunk/drivers/scsi/Kconfig b/trunk/drivers/scsi/Kconfig index 20019b82b4a8..3ee9b8b33be0 100644 --- a/trunk/drivers/scsi/Kconfig +++ b/trunk/drivers/scsi/Kconfig @@ -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