projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'boards' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[cascardo/linux.git]
/
arch
/
arm
/
mach-davinci
/
board-omapl138-hawk.c
diff --git
a/arch/arm/mach-davinci/board-omapl138-hawk.c
b/arch/arm/mach-davinci/board-omapl138-hawk.c
index
d5a6bcd
..
5a2bd44
100644
(file)
--- a/
arch/arm/mach-davinci/board-omapl138-hawk.c
+++ b/
arch/arm/mach-davinci/board-omapl138-hawk.c
@@
-333,7
+333,7
@@
MACHINE_START(OMAPL138_HAWKBOARD, "AM18x/OMAP-L138 Hawkboard")
.atag_offset = 0x100,
.map_io = omapl138_hawk_map_io,
.init_irq = cp_intc_init,
- .
timer = &davinci_timer
,
+ .
init_time = davinci_timer_init
,
.init_machine = omapl138_hawk_init,
.init_late = davinci_init_late,
.dma_zone_size = SZ_128M,