From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753674Ab1ANWBr (ORCPT ); Fri, 14 Jan 2011 17:01:47 -0500 Received: from ogre.sisk.pl ([217.79.144.158]:37631 "EHLO ogre.sisk.pl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752091Ab1ANWBo (ORCPT ); Fri, 14 Jan 2011 17:01:44 -0500 From: "Rafael J. Wysocki" To: Markus Trippelsdorf Subject: Re: [git pull] PCI changes (link error) Date: Fri, 14 Jan 2011 23:01:09 +0100 User-Agent: KMail/1.13.5 (Linux/2.6.37+; KDE/4.4.4; x86_64; ; ) Cc: Jesse Barnes , Linus Torvalds , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org References: <20110114090150.0a212030@jbarnes-desktop> <20110114193731.GA2381@gentoo.trippels.de> In-Reply-To: <20110114193731.GA2381@gentoo.trippels.de> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Message-Id: <201101142301.09624.rjw@sisk.pl> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Friday, January 14, 2011, Markus Trippelsdorf wrote: > On 2011.01.14 at 09:01 -0800, Jesse Barnes wrote: > > ... > > > > Rafael J. Wysocki (5): > > PCI hotplug: Fix unexpected driver unregister in pciehp_acpi.c > > PCI/PCIe: Clear Root PME Status bits early during system resume > > PCI/ACPI: Request _OSC control once for each root bridge (v3) > > This breaks the build if CONFIG_PCIEPORTBUS is not set: > > ld: drivers/built-in.o: in function acpi_pci_root_add:pci_root.c(.devinit.text+0x2633): error: undefined reference to 'pcie_ports_disabled' Does the appended patch help? Rafael --- include/linux/pci.h | 5 +++++ 1 file changed, 5 insertions(+) Index: linux-2.6/include/linux/pci.h =================================================================== --- linux-2.6.orig/include/linux/pci.h +++ linux-2.6/include/linux/pci.h @@ -993,8 +993,13 @@ extern void pci_restore_msi_state(struct extern int pci_msi_enabled(void); #endif +#ifdef CONFIG_PCIEPORTBUS extern bool pcie_ports_disabled; extern bool pcie_ports_auto; +#else +#define pcie_ports_disabled true +#define bool pcie_ports_auto false +#endif #ifndef CONFIG_PCIEASPM static inline int pcie_aspm_enabled(void)