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 'for-upstream' of git://openrisc.net/jonas/linux
[pandora-kernel.git]
/
arch
/
ia64
/
sn
/
kernel
/
sn2
/
timer.c
diff --git
a/arch/ia64/sn/kernel/sn2/timer.c
b/arch/ia64/sn/kernel/sn2/timer.c
index
c34efda
..
0f8844e
100644
(file)
--- a/
arch/ia64/sn/kernel/sn2/timer.c
+++ b/
arch/ia64/sn/kernel/sn2/timer.c
@@
-54,7
+54,7
@@
ia64_sn_udelay (unsigned long usecs)
void __init sn_timer_init(void)
{
- clocksource_sn2.fsys_mmio = RTC_COUNTER_ADDR;
+ clocksource_sn2.
archdata.
fsys_mmio = RTC_COUNTER_ADDR;
clocksource_register_hz(&clocksource_sn2, sn_rtc_cycles_per_second);
ia64_udelay = &ia64_sn_udelay;