Commit a549a455 authored by David Mosberger's avatar David Mosberger Committed by David Mosberger

[PATCH] PCI: move pci_domain_nr() inside "#ifdef CONFIG_PCI" bracket

Trivial build fix: pci_domain_nr() cannot be declared unless
CONFIG_PCI is defined (otherwise, struct pci_bus hasn't been defined).
parent cb2ea63d
...@@ -743,6 +743,15 @@ static inline int pci_module_init(struct pci_driver *drv) ...@@ -743,6 +743,15 @@ static inline int pci_module_init(struct pci_driver *drv)
return rc; return rc;
} }
/*
* PCI domain support. Sometimes called PCI segment (eg by ACPI),
* a PCI domain is defined to be a set of PCI busses which share
* configuration space.
*/
#ifndef CONFIG_PCI_DOMAINS
static inline int pci_domain_nr(struct pci_bus *bus) { return 0; }
#endif
#endif /* !CONFIG_PCI */ #endif /* !CONFIG_PCI */
/* these helpers provide future and backwards compatibility /* these helpers provide future and backwards compatibility
...@@ -800,15 +809,5 @@ extern int pci_pci_problems; ...@@ -800,15 +809,5 @@ extern int pci_pci_problems;
#define PCIPCI_VSFX 16 #define PCIPCI_VSFX 16
#define PCIPCI_ALIMAGIK 32 #define PCIPCI_ALIMAGIK 32
/*
* PCI domain support. Sometimes called PCI segment (eg by ACPI),
* a PCI domain is defined to be a set of PCI busses which share
* configuration space.
*/
#ifndef CONFIG_PCI_DOMAINS
static inline int pci_domain_nr(struct pci_bus *bus) { return 0; }
#endif
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* LINUX_PCI_H */ #endif /* LINUX_PCI_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment