diff options
| author | Tony Lindgren <tony@atomide.com> | 2014-03-01 03:41:55 +0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2014-03-01 03:41:55 +0400 |
| commit | 9ed5811ddd32eb02140783095f1fec7d12fb3eb9 (patch) | |
| tree | 1e13b3c975827e4ff5fa2c244072e452d89894c5 /arch/arm/mach-omap2/board-generic.c | |
| parent | 38dbfb59d1175ef458d006556061adeaa8751b72 (diff) | |
| parent | 110e884d829448e24959f424b31be5bc75bcca6e (diff) | |
| download | linux-9ed5811ddd32eb02140783095f1fec7d12fb3eb9.tar.xz | |
Merge tag 'for-v3.15/omap-hwmod-clk-prcm-a' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.15/prcm
Some low-level optimizations and fixes that don't belong in an -rc
series for various OMAP-family chips, targeted for v3.15.
Basic build, boot, and PM test logs are available here:
http://www.pwsan.com/omap/testlogs/prcm-a-for-v3.15/20140228124518/
Diffstat (limited to 'arch/arm/mach-omap2/board-generic.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-generic.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c index 8e3daa11602b..e94eb0fe95aa 100644 --- a/arch/arm/mach-omap2/board-generic.c +++ b/arch/arm/mach-omap2/board-generic.c @@ -231,6 +231,7 @@ DT_MACHINE_START(AM43_DT, "Generic AM43 (Flattened Device Tree)") .init_machine = omap_generic_init, .init_time = omap3_sync32k_timer_init, .dt_compat = am43_boards_compat, + .restart = omap44xx_restart, MACHINE_END #endif |