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

[pandora-kernel.git] / arch / mips / ar7 / memory.c

diff --git a/arch/mips/ar7/memory.c b/arch/mips/ar7/memory.c
index 46fed44..696c723 100644 (file)
--- a/arch/mips/ar7/memory.c
+++ b/arch/mips/ar7/memory.c
@@ -52,7 +52,7 @@ static int __init memsize(void)
                size <<= 1;
        } while (size < (64 << 20));
 
-       writel(tmpaddr, &addr);
+       writel((u32)tmpaddr, &addr);
 
        return size;
 }