aboutsummaryrefslogtreecommitdiff
path: root/arch/sh64/mm/ioremap.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-09-13 00:34:34 -0400
committerJeff Garzik <jeff@garzik.org>2006-09-13 00:34:34 -0400
commiteff68d452f1a6842fb05218fd93c774ffc4dbc5a (patch)
treedacd3bd93b5f9260034bb206d7182c4a2bc6fac0 /arch/sh64/mm/ioremap.c
parent6a9516989f94df10d9a27ba543c6b53b3e69c84a (diff)
parent95064a75ebf8744e1ff595e8cd7ff9b6c851523e (diff)
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'arch/sh64/mm/ioremap.c')
-rw-r--r--arch/sh64/mm/ioremap.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/sh64/mm/ioremap.c b/arch/sh64/mm/ioremap.c
index fb1866fa2c9..80c56754f51 100644
--- a/arch/sh64/mm/ioremap.c
+++ b/arch/sh64/mm/ioremap.c
@@ -449,7 +449,9 @@ ioremap_proc_info(char *buf, char **start, off_t fpos, int length, int *eof,
if (p + 32 >= e) /* Better than nothing */
break;
if ((nm = r->name) == 0) nm = "???";
- p += sprintf(p, "%08lx-%08lx: %s\n", r->start, r->end, nm);
+ p += sprintf(p, "%08lx-%08lx: %s\n",
+ (unsigned long)r->start,
+ (unsigned long)r->end, nm);
}
return p-buf;