From: Olof Johansson Date: Fri, 2 Aug 2013 20:47:12 +0000 (-0700) Subject: ARM: imx: fix mismerge of localtimer code X-Git-Tag: accepted/tizen/common/20141203.182822~1554^2~12 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=087bd3d4920d276d7f27420a2ca30032df2dbc67;p=platform%2Fkernel%2Flinux-arm64.git 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: Stephen Boyd Signed-off-by: Olof Johansson --- diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 21fa9fa..1303e33 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -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