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-msm
/
board-dt-8660.c
diff --git
a/arch/arm/mach-msm/board-dt-8660.c
b/arch/arm/mach-msm/board-dt-8660.c
index
c111cec
..
7dcfc53
100644
(file)
--- a/
arch/arm/mach-msm/board-dt-8660.c
+++ b/
arch/arm/mach-msm/board-dt-8660.c
@@
-47,6
+47,6
@@
DT_MACHINE_START(MSM_DT, "Qualcomm MSM (Flattened Device Tree)")
.init_irq = irqchip_init,
.init_machine = msm8x60_dt_init,
.init_late = msm8x60_init_late,
- .
timer = &msm_dt_timer
,
+ .
init_time = msm_dt_timer_init
,
.dt_compat = msm8x60_fluid_match,
MACHINE_END