projects
/
GitHub
/
exynos8895
/
android_kernel_samsung_universal8895.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
18060f3
)
ARM: imx: fix mismerge of localtimer code
author
Olof Johansson
<olof@lixom.net>
Fri, 2 Aug 2013 20:47:12 +0000
(13:47 -0700)
committer
Olof Johansson
<olof@lixom.net>
Fri, 2 Aug 2013 20:47:15 +0000
(13:47 -0700)
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>
arch/arm/mach-imx/Kconfig
patch
|
blob
|
blame
|
history
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