diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-12 17:31:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-12 17:31:36 -0700 |
| commit | 7258ea8acd2252d5a68e7dfa2eac8dc8f364b91e (patch) | |
| tree | a13594ddbd91b27c8afa49c1a2c6b4dc8141ae11 /arch/sh64/mm/ioremap.c | |
| parent | af84b99f22df115e7aec41d5dbe936e163ef4e2e (diff) | |
| parent | 1bb99a649af92e53ed7391afaf6c2d45a6f57b42 (diff) | |
| download | op-kernel-dev-7258ea8acd2252d5a68e7dfa2eac8dc8f364b91e.zip op-kernel-dev-7258ea8acd2252d5a68e7dfa2eac8dc8f364b91e.tar.gz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6:
sh64: Add a sane pm_power_off implementation.
sh64: Use generic BUG_ON()/WARN_ON().
sh64: Trivial build fixes.
sh64: Drop deprecated ISA tuning for legacy toolchains.
Diffstat (limited to 'arch/sh64/mm/ioremap.c')
| -rw-r--r-- | arch/sh64/mm/ioremap.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/sh64/mm/ioremap.c b/arch/sh64/mm/ioremap.c index fb1866f..80c5675 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; |
