x86/PCI: only define pci_domain_nr if PCI and PCI_DOMAINS are set
Otherwise we'll duplicate definitions with the pci.h stubs. Reported-by: Randy Dunlap <randy.dunlap@oracle.com> Acked-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
This commit is contained in:
parent
92298e6683
commit
23b90cfd7b
|
@ -27,6 +27,9 @@ extern struct pci_bus *pci_scan_bus_on_node(int busno, struct pci_ops *ops,
|
||||||
int node);
|
int node);
|
||||||
extern struct pci_bus *pci_scan_bus_with_sysdata(int busno);
|
extern struct pci_bus *pci_scan_bus_with_sysdata(int busno);
|
||||||
|
|
||||||
|
#ifdef CONFIG_PCI
|
||||||
|
|
||||||
|
#ifdef CONFIG_PCI_DOMAINS
|
||||||
static inline int pci_domain_nr(struct pci_bus *bus)
|
static inline int pci_domain_nr(struct pci_bus *bus)
|
||||||
{
|
{
|
||||||
struct pci_sysdata *sd = bus->sysdata;
|
struct pci_sysdata *sd = bus->sysdata;
|
||||||
|
@ -37,13 +40,12 @@ static inline int pci_proc_domain(struct pci_bus *bus)
|
||||||
{
|
{
|
||||||
return pci_domain_nr(bus);
|
return pci_domain_nr(bus);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Can be used to override the logic in pci_scan_bus for skipping
|
/* Can be used to override the logic in pci_scan_bus for skipping
|
||||||
already-configured bus numbers - to be used for buggy BIOSes
|
already-configured bus numbers - to be used for buggy BIOSes
|
||||||
or architectures with incomplete PCI setup by the loader */
|
or architectures with incomplete PCI setup by the loader */
|
||||||
|
|
||||||
#ifdef CONFIG_PCI
|
|
||||||
extern unsigned int pcibios_assign_all_busses(void);
|
extern unsigned int pcibios_assign_all_busses(void);
|
||||||
extern int pci_legacy_init(void);
|
extern int pci_legacy_init(void);
|
||||||
# ifdef CONFIG_ACPI
|
# ifdef CONFIG_ACPI
|
||||||
|
|
Loading…
Reference in New Issue