Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  ahci: Add ifdef wrapper to ahci_gtf_filter_workaround
This commit is contained in:
Linus Torvalds 2009-10-09 09:35:50 -07:00
commit 084d3200d5

View File

@ -2884,6 +2884,7 @@ static bool ahci_broken_online(struct pci_dev *pdev)
return pdev->bus->number == (val >> 8) && pdev->devfn == (val & 0xff); return pdev->bus->number == (val >> 8) && pdev->devfn == (val & 0xff);
} }
#ifdef CONFIG_ATA_ACPI
static void ahci_gtf_filter_workaround(struct ata_host *host) static void ahci_gtf_filter_workaround(struct ata_host *host)
{ {
static const struct dmi_system_id sysids[] = { static const struct dmi_system_id sysids[] = {
@ -2927,6 +2928,10 @@ static void ahci_gtf_filter_workaround(struct ata_host *host)
dev->gtf_filter |= filter; dev->gtf_filter |= filter;
} }
} }
#else
static inline void ahci_gtf_filter_workaround(struct ata_host *host)
{}
#endif
static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
{ {