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-omap1
/
board-perseus2.c
diff --git
a/arch/arm/mach-omap1/board-perseus2.c
b/arch/arm/mach-omap1/board-perseus2.c
index
7f019e5
..
67acd41
100644
(file)
--- a/
arch/arm/mach-omap1/board-perseus2.c
+++ b/
arch/arm/mach-omap1/board-perseus2.c
@@
-355,5
+355,5
@@
MACHINE_START(OMAP_PERSEUS2, "OMAP730 Perseus2")
.reserve = omap_reserve,
.init_irq = omap_perseus2_init_irq,
.init_machine = omap_perseus2_init,
- .timer = &omap_timer,
+ .timer = &omap
1
_timer,
MACHINE_END