diff options
| author | Olof Johansson <olof@lixom.net> | 2013-08-02 13:47:12 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-08-02 13:47:15 -0700 |
| commit | 087bd3d4920d276d7f27420a2ca30032df2dbc67 (patch) | |
| tree | cb4fa130d1bc4c9dacee1c5e68091fca300493a1 | |
| parent | 18060f3541cf020d63340bf4c1f9fb82427a7a2a (diff) | |
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>
| -rw-r--r-- | arch/arm/mach-imx/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 21fa9fa3d54e..1303e334c343 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 |