On 09/12/12 09:26, David Brown wrote: > On Wed, Sep 12, 2012 at 04:58:19PM +0200, Arnd Bergmann wrote: >> From: Marc Zyngier <[email protected]> >> >> Convert MSM SMP platforms to use the SoC descriptor to provide >> their SMP and CPU hotplug operations. >> >> Cc: David Brown <[email protected]> >> Signed-off-by: Marc Zyngier <[email protected]> >> Signed-off-by: Arnd Bergmann <[email protected]> >> --- >> arch/arm/mach-msm/board-msm8960.c | 3 +++ >> arch/arm/mach-msm/board-msm8x60.c | 7 +++++++ > Stephen Boyd recently sent out a patch series that remove the non-DT > support for these two targets, which naturally generates a bunch of > conflicts. > > I'm about to send out a pull request including these changes, and > after that, I'll rework this patch for the new board files, and give > it a try.
It would also be nice if you used the common.h file instead of adding a core.h. common.h is a new file in the patch series you mention. -- Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
