Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 087bd3d4 authored by Olof Johansson's avatar Olof Johansson
Browse files

ARM: imx: fix mismerge of localtimer code 



I mis-resolved a merge conflict due to the branch being a bit on the old side,
Stephen noticed. Here's the fix.

Reported-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent 18060f35

arch/arm/mach-imx/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -794,7 +794,6 @@ config SOC_IMX6Q 
	select CPU_V7

	select HAVE_ARM_SCU if SMP

	select HAVE_ARM_TWD if SMP

	select HAVE_CAN_FLEXCAN if CAN

	select HAVE_IMX_ANATOP

	select HAVE_IMX_GPC

	select HAVE_IMX_MMDC