git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus
[pandora-kernel.git]
/
arch
/
powerpc
/
platforms
/
powermac
/
time.c
diff --git
a/arch/powerpc/platforms/powermac/time.c
b/arch/powerpc/platforms/powermac/time.c
index
48211ca
..
11c9fce
100644
(file)
--- a/
arch/powerpc/platforms/powermac/time.c
+++ b/
arch/powerpc/platforms/powermac/time.c
@@
-274,7
+274,7
@@
int __init via_calibrate_decr(void)
return 0;
}
of_node_put(vias);
- via = ioremap(rsrc.start, r
src.end - rsrc.start + 1
);
+ via = ioremap(rsrc.start, r
esource_size(&rsrc)
);
if (via == NULL) {
printk(KERN_ERR "Failed to map VIA for timer calibration !\n");
return 0;