diff options
author | Anton Blanchard <anton@samba.org> | 2011-05-08 17:43:47 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-05-19 00:30:43 -0400 |
commit | 40f1ce7fb7e8b5d4d0821c0f3dc866cb1d47d99c (patch) | |
tree | 5a0f977967bb6353753b034bfb32ab11c8226d30 /arch/powerpc/sysdev/axonram.c | |
parent | be135f40899cb3334faa7d2e27025055da311ec4 (diff) |
powerpc: Remove ioremap_flags
We have a confusing number of ioremap functions. Make things just a
bit simpler by merging ioremap_flags and ioremap_prot.
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/sysdev/axonram.c')
-rw-r--r-- | arch/powerpc/sysdev/axonram.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/axonram.c b/arch/powerpc/sysdev/axonram.c index 1636dd896707..bd0d54060b94 100644 --- a/arch/powerpc/sysdev/axonram.c +++ b/arch/powerpc/sysdev/axonram.c | |||
@@ -216,7 +216,7 @@ static int axon_ram_probe(struct platform_device *device) | |||
216 | AXON_RAM_DEVICE_NAME, axon_ram_bank_id, bank->size >> 20); | 216 | AXON_RAM_DEVICE_NAME, axon_ram_bank_id, bank->size >> 20); |
217 | 217 | ||
218 | bank->ph_addr = resource.start; | 218 | bank->ph_addr = resource.start; |
219 | bank->io_addr = (unsigned long) ioremap_flags( | 219 | bank->io_addr = (unsigned long) ioremap_prot( |
220 | bank->ph_addr, bank->size, _PAGE_NO_CACHE); | 220 | bank->ph_addr, bank->size, _PAGE_NO_CACHE); |
221 | if (bank->io_addr == 0) { | 221 | if (bank->io_addr == 0) { |
222 | dev_err(&device->dev, "ioremap() failed\n"); | 222 | dev_err(&device->dev, "ioremap() failed\n"); |