From 4c56c2a3d8edcab7cbdf0ca74c1859424e1e26ac Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 7 Dec 2007 02:04:33 +1100
Subject: [PATCH] --- yaml --- r: 81025 b: refs/heads/master c:
 6207e81695c1a64ebed668f26106f3384ad2323a h: refs/heads/master i:   81023:
 8ca99a43ea765c8d147f42d5e459efc66dd9d313 v: v3

---
 [refs]                                     | 2 +-
 trunk/arch/powerpc/kernel/pci-common.c     | 9 ++-------
 trunk/arch/powerpc/platforms/iseries/pci.c | 2 ++
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index e58a1143ddb3..f411d9bf6852 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ccc4fd260397f0f8ac6078f4cd45fda2d320ead
+refs/heads/master: 6207e81695c1a64ebed668f26106f3384ad2323a
diff --git a/trunk/arch/powerpc/kernel/pci-common.c b/trunk/arch/powerpc/kernel/pci-common.c
index 78cdb700451c..5a9d4c7bfec5 100644
--- a/trunk/arch/powerpc/kernel/pci-common.c
+++ b/trunk/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
diff --git a/trunk/arch/powerpc/platforms/iseries/pci.c b/trunk/arch/powerpc/platforms/iseries/pci.c
index db0a17e9c4cc..3071a30356ce 100644
--- a/trunk/arch/powerpc/platforms/iseries/pci.c
+++ b/trunk/arch/powerpc/platforms/iseries/pci.c
@@ -673,6 +673,8 @@ void __init iSeries_pcibios_init(void)
 		phb = pcibios_alloc_controller(node);
 		if (phb == NULL)
 			continue;
+		/* All legacy iSeries PHBs are in domain zero */
+		phb->global_number = 0;
 
 		phb->pci_mem_offset = bus;
 		phb->first_busno = bus;