diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-09-09 22:38:43 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-09-09 22:38:43 +0100 |
commit | de9ea203d105f760e8e995c07aa80e855a9aedba (patch) | |
tree | 75e4702e98a0b3ea9ed6d085f74474a70642909b /arch/x86 | |
parent | 2be23c475af8ae4e25f8bab08d815b17593bd547 (diff) | |
parent | d56557af19867edb8c0e96f8e26399698a08857f (diff) | |
download | op-kernel-dev-de9ea203d105f760e8e995c07aa80e855a9aedba.zip op-kernel-dev-de9ea203d105f760e8e995c07aa80e855a9aedba.tar.gz |
Merge branch 'origin'
Diffstat (limited to 'arch/x86')
-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 404a880..d395540 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 |