ARM: imx: fix mismerge of localtimer code · 087bd3d492 - Gogs

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 <sboyd@codeaurora.org>
Signed-off-by: Olof Johansson <olof@lixom.net>

Olof Johansson 12 years ago

parent

18060f3541

commit

087bd3d492

1 changed files with 0 additions and 1 deletions

Split View Show Diff Stats

						
							+ 0
							
							- 1
						
arch/arm/mach-imx/Kconfig
							 
								View File
							
				@@ -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