aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorMarkus Trippelsdorf <markus@trippelsdorf.de>2011-01-14 18:07:22 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-14 18:23:25 -0500
commitab0724ffee24409a7f81afb539b2ac29090bff3e (patch)
tree8d0611d921494af2477d517f4f8a331150bf328d /include/linux
parent9a1fe2f27f71dd275caf2be5be2fa59bd2a3f8d4 (diff)
PCI / ACPI: Fix build issue in pci_root.c for !CONFIG_PCIEPORTBUS
The compilation of drivers/acpi/pci_root.c fails if CONFIG_PCIEPORTBUS is unset. Fix the problem. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/pci.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 9e67dcd054c4..559d02897075 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);
993extern int pci_msi_enabled(void); 993extern int pci_msi_enabled(void);
994#endif 994#endif
995 995
996#ifdef CONFIG_PCIEPORTBUS
996extern bool pcie_ports_disabled; 997extern bool pcie_ports_disabled;
997extern bool pcie_ports_auto; 998extern bool pcie_ports_auto;
999#else
1000#define pcie_ports_disabled true
1001#define pcie_ports_auto false
1002#endif
998 1003
999#ifndef CONFIG_PCIEASPM 1004#ifndef CONFIG_PCIEASPM
1000static inline int pcie_aspm_enabled(void) 1005static inline int pcie_aspm_enabled(void)