From patchwork Fri Oct 9 03:41:47 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Markus Trippelsdorf X-Patchwork-Id: 35552 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 94020B7B74 for ; Fri, 9 Oct 2009 14:51:33 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755220AbZJIDtH (ORCPT ); Thu, 8 Oct 2009 23:49:07 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755509AbZJIDtG (ORCPT ); Thu, 8 Oct 2009 23:49:06 -0400 Received: from smtp-out-068.synserver.de ([212.40.180.68]:1035 "HELO smtp-out-068.synserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1755220AbZJIDtG (ORCPT ); Thu, 8 Oct 2009 23:49:06 -0400 X-Greylist: delayed 398 seconds by postgrey-1.27 at vger.kernel.org; Thu, 08 Oct 2009 23:49:05 EDT Received: (qmail 19923 invoked by uid 0); 9 Oct 2009 03:41:48 -0000 X-SynServer-TrustedSrc: 1 X-SynServer-AuthUser: markus@trippelsdorf.de X-SynServer-PPID: 19860 Received: from 77-23-127-119-dynip.superkabel.de (HELO phenom2.trippelsdorf.de) [77.23.127.119] by 217.119.54.73 with SMTP; 9 Oct 2009 03:41:47 -0000 Date: Fri, 9 Oct 2009 05:41:47 +0200 From: Markus Trippelsdorf To: linux-ide@vger.kernel.org Cc: jeff@garzik.org, tj@kernel.org Subject: ahci_gtf_filter_workaround function breaks current git build Message-ID: <20091009034147.GA1985@phenom2.trippelsdorf.de> MIME-Version: 1.0 Content-Disposition: inline Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org 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 Acked-by: Tejun Heo diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 4edca6e..b1a2577 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) {