On Fri, 14 Jan 2011 23:13:00 +0100 Markus Trippelsdorf <markus@xxxxxxxxxxxxxxx> wrote: > On 2011.01.14 at 23:01 +0100, Rafael J. Wysocki wrote: > > 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? > > > +#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 > > No, but this one does ;-): > > > diff --git a/include/linux/pci.h b/include/linux/pci.h > index 9e67dcd..0f4ca55 100644 > --- a/include/linux/pci.h > +++ b/include/linux/pci.h > @@ -993,8 +993,13 @@ extern void pci_restore_msi_state(struct pci_dev *dev); > 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 pcie_ports_auto false > +#endif > > #ifndef CONFIG_PCIEASPM > static inline int pcie_aspm_enabled(void) > Linus, can you just take this directly so the link error isn't in your tree any longer than necessary? Thanks, -- Jesse Barnes, Intel Open Source Technology Center -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
