diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-11-04 02:10:35 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-11-04 02:10:35 -0500 |
commit | b6d0137d6156db54a9e6ff74458ed4342a45abb5 (patch) | |
tree | ae4139b2af5af7e382208645d4b66ff184c1e53a /arch/powerpc/kernel/pci_64.c | |
parent | 5c1a56b5f616f7063f91eb85f0ea209658f387dc (diff) | |
parent | 51bb296b09a83ee1aae025778db38f9d2cc7bb1a (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/powerpc/kernel/pci_64.c')
-rw-r--r-- | arch/powerpc/kernel/pci_64.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c index ba949a2c93ac..ccf56ac92de5 100644 --- a/arch/powerpc/kernel/pci_64.c +++ b/arch/powerpc/kernel/pci_64.c | |||
@@ -97,7 +97,9 @@ int pcibios_unmap_io_space(struct pci_bus *bus) | |||
97 | * to do an appropriate TLB flush here too | 97 | * to do an appropriate TLB flush here too |
98 | */ | 98 | */ |
99 | if (bus->self) { | 99 | if (bus->self) { |
100 | #ifdef CONFIG_PPC_STD_MMU_64 | ||
100 | struct resource *res = bus->resource[0]; | 101 | struct resource *res = bus->resource[0]; |
102 | #endif | ||
101 | 103 | ||
102 | pr_debug("IO unmapping for PCI-PCI bridge %s\n", | 104 | pr_debug("IO unmapping for PCI-PCI bridge %s\n", |
103 | pci_name(bus->self)); | 105 | pci_name(bus->self)); |