From 8ca99a43ea765c8d147f42d5e459efc66dd9d313 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Tue, 11 Dec 2007 11:03:48 +1100 Subject: [PATCH] --- yaml --- r: 81023 b: refs/heads/master c: c96bede657510cfb171c0fd86fc710582a1c5a5f h: refs/heads/master i: 81021: 6a41c30c5ad9047cc844b5960a27ddd01b042344 81019: d75d876f9e7d402efaaee5c7ef107ee41e4d594c 81015: 6a2f3d26c8a842c3d545db0d4004469907fb3688 81007: 084ee4caa23cd85436a405f68d43faa7d42c700e 80991: 0dc26145abe1adda414e9befcad262aa300ef997 80959: ad59e4f9f383ab9a11ea7bd11f6ef2a5f0bbd668 80895: 8751fd40f4d79d8046c7f46ee45e73e7ebdffc67 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/pci_64.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 074ebc740a69..97476a577b15 100644 --- 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 index 69364f3dc5c6..7e74aa2bfbaa 100644 --- 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,