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-s5p64x0
/
mach-smdk6440.c
diff --git
a/arch/arm/mach-s5p64x0/mach-smdk6440.c
b/arch/arm/mach-s5p64x0/mach-smdk6440.c
index
e241929
..
a40d5eb
100644
(file)
--- a/
arch/arm/mach-s5p64x0/mach-smdk6440.c
+++ b/
arch/arm/mach-s5p64x0/mach-smdk6440.c
@@
-273,6
+273,6
@@
MACHINE_START(SMDK6440, "SMDK6440")
.init_irq = s5p6440_init_irq,
.map_io = smdk6440_map_io,
.init_machine = smdk6440_machine_init,
- .
timer = &s5p_timer
,
+ .
init_time = s5p_timer_init
,
.restart = s5p64x0_restart,
MACHINE_END