diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2007-12-06 15:04:33 (GMT) |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-12-11 02:42:36 (GMT) |
| commit | 6207e81695c1a64ebed668f26106f3384ad2323a (patch) | |
| tree | ec303ea6f50cf41fb51eb027025239146f9d50db /arch/powerpc/kernel | |
| parent | 9ccc4fd260397f0f8ac6078f4cd45fda2d320ead (diff) | |
| download | linux-6207e81695c1a64ebed668f26106f3384ad2323a.tar.xz | |
[POWERPC] Don't special case pci_domain_nr() for iSeries
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel')
| -rw-r--r-- | arch/powerpc/kernel/pci-common.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c index 78cdb70..5a9d4c7 100644 --- a/arch/powerpc/kernel/pci-common.c +++ b/arch/powerpc/kernel/pci-common.c @@ -115,15 +115,10 @@ int pcibios_vaddr_is_ioport(void __iomem *address) */ int pci_domain_nr(struct pci_bus *bus) { - if (firmware_has_feature(FW_FEATURE_ISERIES)) - return 0; - else { - struct pci_controller *hose = pci_bus_to_host(bus); + struct pci_controller *hose = pci_bus_to_host(bus); - return hose->global_number; - } + return hose->global_number; } - EXPORT_SYMBOL(pci_domain_nr); #ifdef CONFIG_PPC_OF |