summaryrefslogtreecommitdiff
path: root/arch/powerpc/sysdev/axonram.c
diff options
context:
space:
mode:
authorAnton Blanchard <anton@samba.org>2011-05-08 21:43:47 +0000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2011-05-19 14:30:43 +1000
commit40f1ce7fb7e8b5d4d0821c0f3dc866cb1d47d99c (patch)
tree5a0f977967bb6353753b034bfb32ab11c8226d30 /arch/powerpc/sysdev/axonram.c
parentbe135f40899cb3334faa7d2e27025055da311ec4 (diff)
downloadlinux-3.10-40f1ce7fb7e8b5d4d0821c0f3dc866cb1d47d99c.tar.gz
linux-3.10-40f1ce7fb7e8b5d4d0821c0f3dc866cb1d47d99c.tar.bz2
linux-3.10-40f1ce7fb7e8b5d4d0821c0f3dc866cb1d47d99c.zip
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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/axonram.c b/arch/powerpc/sysdev/axonram.c
index 1636dd89670..bd0d54060b9 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)
AXON_RAM_DEVICE_NAME, axon_ram_bank_id, bank->size >> 20);
bank->ph_addr = resource.start;
- bank->io_addr = (unsigned long) ioremap_flags(
+ bank->io_addr = (unsigned long) ioremap_prot(
bank->ph_addr, bank->size, _PAGE_NO_CACHE);
if (bank->io_addr == 0) {
dev_err(&device->dev, "ioremap() failed\n");