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 'driver-core-next' into Linux 3.2
[pandora-kernel.git]
/
arch
/
arm
/
mach-bcmring
/
core.c
diff --git
a/arch/arm/mach-bcmring/core.c
b/arch/arm/mach-bcmring/core.c
index
31d84ae
..
6b67b7e
100644
(file)
--- a/
arch/arm/mach-bcmring/core.c
+++ b/
arch/arm/mach-bcmring/core.c
@@
-234,7
+234,7
@@
void __init bcmring_init_timer(void)
*/
bcmring_clocksource_init();
- sp804_clockevents_
register
(TIMER0_VA_BASE, IRQ_TIMER0, "timer0");
+ sp804_clockevents_
init
(TIMER0_VA_BASE, IRQ_TIMER0, "timer0");
}
struct sys_timer bcmring_timer = {