From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753889Ab1APTpl (ORCPT ); Sun, 16 Jan 2011 14:45:41 -0500 Received: from ogre.sisk.pl ([217.79.144.158]:39843 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753774Ab1APTph (ORCPT ); Sun, 16 Jan 2011 14:45:37 -0500 From: "Rafael J. Wysocki" To: Len Brown Subject: [PATCH 1/2] PCI / ACPI: Fix build of the AER driver for CONFIG_ACPI unset Date: Sun, 16 Jan 2011 20:42:43 +0100 User-Agent: KMail/1.13.5 (Linux/2.6.37+; KDE/4.4.4; x86_64; ; ) Cc: Jesse Barnes , ACPI Devel Maling List , linux-pci@vger.kernel.org, LKML , Stephen Rothwell , Andres Salomon , Linus Torvalds References: <201101162041.02419.rjw@sisk.pl> In-Reply-To: <201101162041.02419.rjw@sisk.pl> MIME-Version: 1.0 Content-Type: Text/Plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <201101162042.43341.rjw@sisk.pl> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rafael J. Wysocki After commit 415e12b (PCI/ACPI: Request _OSC control once for each root bridge (v3)) include/linux/pci-acpi.h is included by drivers/pci/pcie/aer/aerdrv.c and if CONFIG_ACPI is unset, the bogus and unnecessary alternative definition of acpi_find_root_bridge_handle() causes a build error to occur. Remove the offending piece of garbage. Reported-and-tested-by: Stephen Rothwell Signed-off-by: Rafael J. Wysocki --- include/linux/pci-acpi.h | 3 --- 1 file changed, 3 deletions(-) Index: linux-2.6/include/linux/pci-acpi.h =================================================================== --- linux-2.6.orig/include/linux/pci-acpi.h +++ linux-2.6/include/linux/pci-acpi.h @@ -35,9 +35,6 @@ static inline acpi_handle acpi_pci_get_b return acpi_get_pci_rootbridge_handle(pci_domain_nr(pbus), pbus->number); } -#else -static inline acpi_handle acpi_find_root_bridge_handle(struct pci_dev *pdev) -{ return NULL; } #endif #ifdef CONFIG_ACPI_APEI