Re: [git pull] PCI changes (link error)

["Rafael J. Wysocki" <rjw@sisk.pl>]

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)