diff --git a/[refs] b/[refs] index e7bf74f78c80..66f28daf8db1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 838c05705ef8c110037a713526bb18762db0a241 +refs/heads/master: dd34b5a82feadfaee4f8dea83a694d9349f94a28 diff --git a/trunk/arch/mips/ar7/memory.c b/trunk/arch/mips/ar7/memory.c index 46fed44825a6..696c723dc6d4 100644 --- a/trunk/arch/mips/ar7/memory.c +++ b/trunk/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; }