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 'virtio-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
arch
/
arm
/
mach-at91
/
board-sam9261ek.c
diff --git
a/arch/arm/mach-at91/board-sam9261ek.c
b/arch/arm/mach-at91/board-sam9261ek.c
index
13ebaa8
..
b446645
100644
(file)
--- a/
arch/arm/mach-at91/board-sam9261ek.c
+++ b/
arch/arm/mach-at91/board-sam9261ek.c
@@
-612,7
+612,7
@@
MACHINE_START(AT91SAM9261EK, "Atmel AT91SAM9261-EK")
MACHINE_START(AT91SAM9G10EK, "Atmel AT91SAM9G10-EK")
#endif
/* Maintainer: Atmel */
- .
timer = &at91sam926x_timer
,
+ .
init_time = at91sam926x_pit_init
,
.map_io = at91_map_io,
.handle_irq = at91_aic_handle_irq,
.init_early = ek_init_early,