diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2007-12-06 10:04:33 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-12-10 21:42:36 -0500 |
commit | 6207e81695c1a64ebed668f26106f3384ad2323a (patch) | |
tree | ec303ea6f50cf41fb51eb027025239146f9d50db /arch/powerpc/kernel/pci-common.c | |
parent | 9ccc4fd260397f0f8ac6078f4cd45fda2d320ead (diff) |
[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/pci-common.c')
-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 78cdb700451c..5a9d4c7bfec5 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) | |||
115 | */ | 115 | */ |
116 | int pci_domain_nr(struct pci_bus *bus) | 116 | int pci_domain_nr(struct pci_bus *bus) |
117 | { | 117 | { |
118 | if (firmware_has_feature(FW_FEATURE_ISERIES)) | 118 | struct pci_controller *hose = pci_bus_to_host(bus); |
119 | return 0; | ||
120 | else { | ||
121 | struct pci_controller *hose = pci_bus_to_host(bus); | ||
122 | 119 | ||
123 | return hose->global_number; | 120 | return hose->global_number; |
124 | } | ||
125 | } | 121 | } |
126 | |||
127 | EXPORT_SYMBOL(pci_domain_nr); | 122 | EXPORT_SYMBOL(pci_domain_nr); |
128 | 123 | ||
129 | #ifdef CONFIG_PPC_OF | 124 | #ifdef CONFIG_PPC_OF |