diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 09:59:47 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 09:59:47 -0500 |
| commit | 5cb2faa6ede7ada9cb2bffc832c4ce60f53d6834 (patch) | |
| tree | 7b72b66081d042a41dc822575503133364857ce2 /arch/powerpc/kernel/pci_64.c | |
| parent | e0ee98513d1a2e24d2ddbdecf4216bcca29d1158 (diff) | |
| parent | 6060e8df517847bf445ebc61de7d4d9c7faae990 (diff) | |
Merge branch 'pending-misc' (early part) into devel
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)); |