[GIT PULL] Remove ARM local timer API
sboyd at codeaurora.org
Thu Jul 25 12:13:37 EDT 2013
On 07/23, Olof Johansson wrote:
> On Tue, Jul 23, 2013 at 4:40 PM, Stephen Boyd <sboyd at codeaurora.org> wrote:
> > On 07/23, Olof Johansson wrote:
> >> Merged in as localtimer/removal into next/cleanup.
> >> I had quite a few merge conflicts due to the __cpuinit removal, so
> >> please double-check my resolutions.
> > A __cpuinit is leftover in smp_twd.c. Hopefully you can just
> > redo the merge?
> Done, thanks for catching it. I thought I grepped for them but I
> somehow missed that one. Fixed now.
Also I think a HAVE_CAN_FLEXCAN if CAN was dragged in to
arch/arm/mach-imx/Kconfig. Here's a patch.
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 21fa9fa..1303e33 100644
@@ -794,7 +794,6 @@ config SOC_IMX6Q
select HAVE_ARM_SCU if SMP
select HAVE_ARM_TWD if SMP
- select HAVE_CAN_FLEXCAN if CAN
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
hosted by The Linux Foundation
More information about the linux-arm-kernel