Messages in this thread | | | Date | Fri, 22 Mar 2013 15:09:41 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the imx-mxs tree with the arm-soc tree |
| |
Hi Shawn,
Today's linux-next merge of the imx-mxs tree got a conflict in arch/arm/mach-imx/mach-imx6q.c between commit da4a686a2cfb ("ARM: smp_twd: convert to use CLKSRC_OF init") from the arm-soc tree and commit 371287432334 ("ARM: imx: enable anatop suspend/resume") from the imx-mxs tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/arm/mach-imx/mach-imx6q.c index b59ddcb,31aee4d..0000000 --- a/arch/arm/mach-imx/mach-imx6q.c +++ b/arch/arm/mach-imx/mach-imx6q.c @@@ -291,8 -257,7 +256,7 @@@ static void __init imx6q_init_irq(void static void __init imx6q_timer_init(void) { mx6q_clocks_init(); - twd_local_timer_of_register(); + clocksource_of_init(); - imx_print_silicon_rev("i.MX6Q", imx6q_revision()); } static const char *imx6q_dt_compat[] __initdata = { [unhandled content-type:application/pgp-signature] | |