---

yaml --- r: 231249 b: refs/heads/master c: ab0724f h: refs/heads/master i: 231247: 32b0d35 v: v3
git-mirror · Jan 14, 2011 · b1f00a5 · b1f00a5
1 parent c112522
commit b1f00a5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a1fe2f27f71dd275caf2be5be2fa59bd2a3f8d4
+refs/heads/master: ab0724ffee24409a7f81afb539b2ac29090bff3e
diff --git a/trunk/include/linux/pci.h b/trunk/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)