diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2010-08-17 09:15:24 -0700 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2010-08-17 09:29:36 -0700 |
| commit | 23b90cfd7bcf8ae1c0711df1cae7dfec3c01aec8 (patch) | |
| tree | ec09c9fbfa2f2545dd6c52933e709f8b9712345a /arch/x86/include | |
| parent | 92298e668372f2f6c8a79fb272f13d65161a4876 (diff) | |
| download | kernel_samsung_smdk4412-23b90cfd7bcf8ae1c0711df1cae7dfec3c01aec8.zip kernel_samsung_smdk4412-23b90cfd7bcf8ae1c0711df1cae7dfec3c01aec8.tar.gz kernel_samsung_smdk4412-23b90cfd7bcf8ae1c0711df1cae7dfec3c01aec8.tar.bz2 | |
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>
Diffstat (limited to 'arch/x86/include')
| -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 |