Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / arch / powerpc / sysdev / axonram.c

diff --git a/arch/powerpc/sysdev/axonram.c b/arch/powerpc/sysdev/axonram.c
index 1636dd8..bd0d540 100644 (file)
--- 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");