Messages in this thread Patch in this message | | | Date | Mon, 17 Oct 2005 10:12:33 -0700 (PDT) | From | Linus Torvalds <> | Subject | Re: [PATCH] libata: fix broken Kconfig setup |
| |
On Mon, 17 Oct 2005, Jeff Garzik wrote: > > If IDE is compiled in, IDE SATA option is not enabled, and ata_piix or ahci > are used.
How about this diff instead?
It's really quite clean and understandable, and it makes it very clear what's going on from a configuration standpoint, imnsho. And it does the right thing when AHCI/PIIX is compiled as a SATA module (well, as right as this approach ever can).
Of course, somebody should check that it really is just the AHCI and PIIX drivers that want the quirk, but I think the _approach_ is obvious.
Linus
---- diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 11ca443..7bb5725 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -1233,7 +1233,7 @@ static void __init quirk_alder_ioapic(st DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_EESSC, quirk_alder_ioapic ); #endif -#ifdef CONFIG_SCSI_SATA +#ifdef CONFIG_INTEL_SATA_QUIRK static void __devinit quirk_intel_ide_combined(struct pci_dev *pdev) { u8 prog, comb, tmp; diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig index 20019b8..49ef1c6 100644 --- a/drivers/scsi/Kconfig +++ b/drivers/scsi/Kconfig @@ -445,9 +445,14 @@ config SCSI_SATA If unsure, say N. +config INTEL_SATA_QUIRK + bool + default n + config SCSI_SATA_AHCI tristate "AHCI SATA support" depends on SCSI_SATA && PCI + select INTEL_SATA_QUIRK help This option enables support for AHCI Serial ATA. @@ -465,6 +470,7 @@ config SCSI_SATA_SVW config SCSI_ATA_PIIX tristate "Intel PIIX/ICH SATA support" depends on SCSI_SATA && PCI + select INTEL_SATA_QUIRK help This option enables support for ICH5 Serial ATA. If PATA support was enabled previously, this enables - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |