[git,pull] PCI changes (link error)

Commit Message

Rafael Wysocki Jan. 14, 2011, 10:01 p.m. UTC

None

Patch

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)