From 743050531e67980a3ff3e4f64fb318f3b1dcdd06 Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Mon, 21 Jan 2008 11:32:50 +1100 Subject: [PATCH] --- yaml --- r: 81343 b: refs/heads/master c: 9d5f49283b85d925f17fa07af5e4879465e179d6 h: refs/heads/master i: 81341: 24c672bfb741f89466f960a99618db8a1aeb9676 81339: 16b4daec4502ba68ae5057d71267f0aec5145db9 81335: 3f4de2823f76fc654316574232a891bbb466ac29 81327: 97cbe6082ba731e5f391cbb8ba6ef2c2aa59a57f 81311: c99cde52aabdb25922d1e38c8040f97c501365e6 81279: 0d6feb905759c65cf995cd6d4fc7c6eb8541772c v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/pci_64.c | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 48eb4ed50f5c..653a7eaa4f48 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 335675a3a2e6f3dc8f47111f73362aae8acc36bc +refs/heads/master: 9d5f49283b85d925f17fa07af5e4879465e179d6 diff --git a/trunk/arch/powerpc/kernel/pci_64.c b/trunk/arch/powerpc/kernel/pci_64.c index 1930f393d01c..52750745edfd 100644 --- a/trunk/arch/powerpc/kernel/pci_64.c +++ b/trunk/arch/powerpc/kernel/pci_64.c @@ -357,7 +357,6 @@ void __devinit scan_phb(struct pci_controller *hose) struct pci_bus *bus; struct device_node *node = hose->dn; int i, mode; - struct resource *res; DBG("PCI: Scanning PHB %s\n", node ? node->full_name : ""); @@ -375,12 +374,10 @@ void __devinit scan_phb(struct pci_controller *hose) pcibios_map_io_space(bus); /* Wire up PHB bus resources */ - if (hose->io_resource.flags) { - DBG("PCI: PHB IO resource = %016lx-%016lx [%lx]\n", - hose->io_resource.start, hose->io_resource.end, - hose->io_resource.flags); - bus->resource[0] = res = &hose->io_resource; - } + DBG("PCI: PHB IO resource = %016lx-%016lx [%lx]\n", + hose->io_resource.start, hose->io_resource.end, + hose->io_resource.flags); + bus->resource[0] = &hose->io_resource; for (i = 0; i < 3; ++i) { DBG("PCI: PHB MEM resource %d = %016lx-%016lx [%lx]\n", i, hose->mem_resources[i].start,