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 branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap2
/
board-am3517evm.c
diff --git
a/arch/arm/mach-omap2/board-am3517evm.c
b/arch/arm/mach-omap2/board-am3517evm.c
index
63af417
..
f3006c3
100644
(file)
--- a/
arch/arm/mach-omap2/board-am3517evm.c
+++ b/
arch/arm/mach-omap2/board-am3517evm.c
@@
-494,7
+494,7
@@
MACHINE_START(OMAP3517EVM, "OMAP3517/AM3517 EVM")
.reserve = omap_reserve,
.map_io = omap3_map_io,
.init_early = am3517_evm_init_early,
.reserve = omap_reserve,
.map_io = omap3_map_io,
.init_early = am3517_evm_init_early,
- .init_irq = omap_init_irq,
+ .init_irq = omap
3
_init_irq,
.init_machine = am3517_evm_init,
.init_machine = am3517_evm_init,
- .timer = &omap_timer,
+ .timer = &omap
3
_timer,
MACHINE_END
MACHINE_END