diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-09-07 10:24:29 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-09-07 10:24:29 +1000 |
| commit | e8b04ae2892f39b53ac077e613fe739ba3d09884 (patch) | |
| tree | 8bfe913a04c176adbd6316fad5b288c6b2fa1030 /arch | |
| parent | eb42ab55a310c668cb734e0e2679b2c37e8dbe32 (diff) | |
| parent | 17134d96735115644cc2f0e2b1bab51ca6e3ab95 (diff) | |
Merge remote branch 'pci-current/for-linus'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/include/asm/pci.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h index 404a880ea325..d395540ff894 100644 --- a/arch/x86/include/asm/pci.h +++ b/arch/x86/include/asm/pci.h @@ -27,6 +27,9 @@ extern struct pci_bus *pci_scan_bus_on_node(int busno, struct pci_ops *ops, int node); 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) { 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); } - +#endif /* Can be used to override the logic in pci_scan_bus for skipping already-configured bus numbers - to be used for buggy BIOSes or architectures with incomplete PCI setup by the loader */ -#ifdef CONFIG_PCI extern unsigned int pcibios_assign_all_busses(void); extern int pci_legacy_init(void); # ifdef CONFIG_ACPI |