Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 276497
b: refs/heads/master
c: 8d2d2d1
h: refs/heads/master
i:
  276495: ac8b42b
v: v3
  • Loading branch information
Lauri Hintsala authored and Shawn Guo committed Dec 2, 2011
1 parent 7c0a59e commit a840a71
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5d348401ed03450395ce674594c1c08c7d85bd8d
refs/heads/master: 8d2d2d1d7e96f12d9fe140169fb39ef9fd27b7c1
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-mxs/mach-m28evk.c
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,6 @@ static struct sys_timer m28evk_timer = {
MACHINE_START(M28EVK, "DENX M28 EVK")
.map_io = mx28_map_io,
.init_irq = mx28_init_irq,
.init_machine = m28evk_init,
.timer = &m28evk_timer,
.init_machine = m28evk_init,
MACHINE_END
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-mxs/mach-stmp378x_devb.c
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,6 @@ static struct sys_timer stmp378x_dvb_timer = {
MACHINE_START(STMP378X, "STMP378X")
.map_io = mx23_map_io,
.init_irq = mx23_init_irq,
.init_machine = stmp378x_dvb_init,
.timer = &stmp378x_dvb_timer,
.init_machine = stmp378x_dvb_init,
MACHINE_END

0 comments on commit a840a71

Please sign in to comment.