ARM: imx: fix mismerge of localtimer code

[karo-tx-linux.git] / arch / arm / mach-imx / Kconfig

diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 21fa9fa3d54ec5f10e80496e0c980dd5581eb9a6..1303e334c343a1c8e2089d66aa13f260b731d3ce 100644 (file)
--- 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