---

yaml --- r: 81023 b: refs/heads/master c: c96bede h: refs/heads/master i: 81021: 6a41c30 81019: d75d876 81015: 6a2f3d2 81007: 084ee4c 80991: 0dc2614 80959: ad59e4f 80895: 8751fd4 v: v3
git-mirror · Dec 11, 2007 · 8ca99a4 · 8ca99a4
1 parent fffa103
commit 8ca99a4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cb993029094ed61f286793819d3aaa1deea5b252
+refs/heads/master: c96bede657510cfb171c0fd86fc710582a1c5a5f
diff --git a/trunk/arch/powerpc/kernel/pci_64.c b/trunk/arch/powerpc/kernel/pci_64.c
@@ -581,12 +581,8 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)
 /* Decide whether to display the domain number in /proc */
 int pci_proc_domain(struct pci_bus *bus)
 {
-	if (firmware_has_feature(FW_FEATURE_ISERIES))
-		return 0;
-	else {
-		struct pci_controller *hose = pci_bus_to_host(bus);
-		return hose->buid != 0;
-	}
+	struct pci_controller *hose = pci_bus_to_host(bus);
+	return hose->buid != 0;
 }
 
 void __devinit pci_process_bridge_OF_ranges(struct pci_controller *hose,