summaryrefslogtreecommitdiffstats
path: root/drivers/ata
diff options
context:
space:
mode:
authorMarkus Trippelsdorf <markus@trippelsdorf.de>2009-10-09 05:41:47 +0200
committerJeff Garzik <jgarzik@redhat.com>2009-10-09 06:29:07 +0200
commit8e5132175bebaa26f8ea5036a1e942686c11cab4 (patch)
treef4c4f98f285bfbb476d86d38a633d2536399a9d5 /drivers/ata
parentMerge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff)
downloadlinux-8e5132175bebaa26f8ea5036a1e942686c11cab4.tar.xz
linux-8e5132175bebaa26f8ea5036a1e942686c11cab4.zip
ahci: Add ifdef wrapper to ahci_gtf_filter_workaround
Commit f80ae7e45a0e03da188494c6e947a5c8b0cdfb4a ahci: filter FPDMA non-zero offset enable for Aspire 3810T breaks the current git build for configurations that don't define CONFIG_ATA_ACPI. This adds an ifdef wrapper to ahci_gtf_filter_workaround. Signed-off-by: Markus Trippelsdorf <markus@trippelsdorf.de> Acked-by: Tejun Heo <tj@kernel.org> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/ata')
-rw-r--r--drivers/ata/ahci.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index 4edca6eb73ae..b1a257746a19 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -2884,6 +2884,7 @@ static bool ahci_broken_online(struct pci_dev *pdev)
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 const struct dmi_system_id sysids[] = {
@@ -2927,6 +2928,10 @@ static void ahci_gtf_filter_workaround(struct ata_host *host)
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)
{