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
/
ia64
/
kernel
/
cyclone.c
diff --git
a/arch/ia64/kernel/cyclone.c
b/arch/ia64/kernel/cyclone.c
index
f64097b
..
4826ff9
100644
(file)
--- a/
arch/ia64/kernel/cyclone.c
+++ b/
arch/ia64/kernel/cyclone.c
@@
-115,7
+115,7
@@
int __init init_cyclone_clock(void)
}
/* initialize last tick */
cyclone_mc = cyclone_timer;
- clocksource_cyclone.fsys_mmio = cyclone_timer;
+ clocksource_cyclone.
archdata.
fsys_mmio = cyclone_timer;
clocksource_register_hz(&clocksource_cyclone, CYCLONE_TIMER_FREQ);
return 0;