Attachment 106787 Details for Bug 217930

[patch] bah... dumb.

0001-libata-s-CONFIG_SCSI_SATA-CONFIG_-S-ATA-g-in-pci-quirks.c.txt (text/plain), 1.69 KB, created by tejun heo on 2006-11-24 05:05:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tejun heo

Created: 2006-11-24 05:05:58 UTC

Size: 1.69 KB

patch

obsolete

>From 7796705244d1f04053acf24bee7eb2983f9cfeaf Mon Sep 17 00:00:00 2001
>From: Tejun Heo <htejun@gmail.com>
>Date: Sat, 19 Aug 2006 03:54:39 +0900
>Subject: [PATCH] [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: Tejun Heo <htejun@gmail.com>
>Signed-off-by: Jeff Garzik <jeff@garzik.org>
>---
> drivers/pci/quirks.c |    6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
>index fb08bc9..2d967b4 100644
>--- a/drivers/pci/quirks.c
>+++ b/drivers/pci/quirks.c
>@@ -1209,7 +1209,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_S
> 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 *s
> }
> __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_co
> 		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;
>-- 
>1.4.3.5
>

Actions: View | Diff

Attachments on bug 217930: 106768 | 106787