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 tag 'gic-vic-to-irqchip' of git://sources.calxeda.com/kernel/linux into next...
[pandora-kernel.git]
/
arch
/
arm
/
mach-exynos
/
mach-universal_c210.c
diff --git
a/arch/arm/mach-exynos/mach-universal_c210.c
b/arch/arm/mach-exynos/mach-universal_c210.c
index
be37775
..
c9d33a4
100644
(file)
--- a/
arch/arm/mach-exynos/mach-universal_c210.c
+++ b/
arch/arm/mach-exynos/mach-universal_c210.c
@@
-1152,7
+1152,7
@@
MACHINE_START(UNIVERSAL_C210, "UNIVERSAL_C210")
.map_io = universal_map_io,
.init_machine = universal_machine_init,
.init_late = exynos_init_late,
- .
timer = &s5p_timer
,
+ .
init_time = s5p_timer_init
,
.reserve = &universal_reserve,
.restart = exynos4_restart,
MACHINE_END