From b1f00a5e2472e5bed9afb02f9651ed9f46fd0f92 Mon Sep 17 00:00:00 2001
From: Markus Trippelsdorf <markus@trippelsdorf.de>
Date: Sat, 15 Jan 2011 00:07:22 +0100
Subject: [PATCH] --- yaml --- r: 231249 b: refs/heads/master c:
 ab0724ffee24409a7f81afb539b2ac29090bff3e h: refs/heads/master i:   231247:
 32b0d3526209b7e1d1e17011c26b929c1a1ce327 v: v3

---
 [refs]                    | 2 +-
 trunk/include/linux/pci.h | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e0108b87d10d..1f064f580570 100644
--- 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
index 9e67dcd054c4..559d02897075 100644
--- 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)