git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'late-omap' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-omap2
/
board-generic.c
diff --git
a/arch/arm/mach-omap2/board-generic.c
b/arch/arm/mach-omap2/board-generic.c
index 2590463e4b57d5729cc7e22ab9198c4c60464426..0274ff7a2a2b1c33dcdcf5e6aaac541f15a86c84 100644
(file)
--- a/
arch/arm/mach-omap2/board-generic.c
+++ b/
arch/arm/mach-omap2/board-generic.c
@@
-140,6
+140,7
@@
DT_MACHINE_START(AM33XX_DT, "Generic AM33XX (Flattened Device Tree)")
.init_machine = omap_generic_init,
.init_time = omap3_am33xx_gptimer_timer_init,
.dt_compat = am33xx_boards_compat,
+ .restart = am33xx_restart,
MACHINE_END
#endif