diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-09 09:35:50 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-09 09:35:50 -0700 |
| commit | 084d3200d523fc24d95e97797b6cdf1256bf0d1b (patch) | |
| tree | a9607d0792a82026c83a81eab53dff5e1131af09 | |
| parent | 1442138372d19907473cfc82c37e8dd7c3359034 (diff) | |
| parent | 8e5132175bebaa26f8ea5036a1e942686c11cab4 (diff) | |
| download | linux-3.10-084d3200d523fc24d95e97797b6cdf1256bf0d1b.tar.gz linux-3.10-084d3200d523fc24d95e97797b6cdf1256bf0d1b.tar.bz2 linux-3.10-084d3200d523fc24d95e97797b6cdf1256bf0d1b.zip | |
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
| -rw-r--r-- | drivers/ata/ahci.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 4edca6eb73a..b1a257746a1 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) { |