diff options
| author | Olof Johansson <olof@lixom.net> | 2013-08-02 16:47:12 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-08-02 16:47:15 -0400 |
| 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 | |||
| 794 | select CPU_V7 | 794 | select CPU_V7 |
| 795 | select HAVE_ARM_SCU if SMP | 795 | select HAVE_ARM_SCU if SMP |
| 796 | select HAVE_ARM_TWD if SMP | 796 | select HAVE_ARM_TWD if SMP |
| 797 | select HAVE_CAN_FLEXCAN if CAN | ||
| 798 | select HAVE_IMX_ANATOP | 797 | select HAVE_IMX_ANATOP |
| 799 | select HAVE_IMX_GPC | 798 | select HAVE_IMX_GPC |
| 800 | select HAVE_IMX_MMDC | 799 | select HAVE_IMX_MMDC |