From: Arnd Bergmann Date: Tue, 9 Apr 2013 13:57:59 +0000 (+0200) Subject: Merge tag 'mxs-multiplatform-3.10' of git://git.linaro.org/people/shawnguo/linux... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=d93bea007ab3d77b796eb99fb4ff4eeb013e0dfa;p=linux.git Merge tag 'mxs-multiplatform-3.10' of git://git.linaro.org/people/shawnguo/linux-2.6 into next/multiplatform From Shawn Guo : The mxs multiplatform support for 3.10: * It enables the multiplatform build for mach-mxs platform. * tag 'mxs-multiplatform-3.10' of git://git.linaro.org/people/shawnguo/linux-2.6: ARM: mxs: enable multiplatform build ARM: mxs: rename debug-macro.S for multiplatform build ARM: mxs: call mxs_pm_init() as a machine_desc hook Conflicts: arch/arm/Kconfig.debug Signed-off-by: Arnd Bergmann --- d93bea007ab3d77b796eb99fb4ff4eeb013e0dfa diff --cc arch/arm/Kconfig.debug index edb496b656b1a,057601e685e81..e00bd4d4ab63e --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@@ -618,10 -591,9 +618,11 @@@ config DEBUG_LL_INCLUD DEBUG_IMX6Q_UART default "debug/highbank.S" if DEBUG_HIGHBANK_UART default "debug/mvebu.S" if DEBUG_MVEBU_UART + default "debug/mxs.S" if DEBUG_IMX23_UART || DEBUG_IMX28_UART + default "debug/nomadik.S" if DEBUG_NOMADIK_UART default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART default "debug/picoxcell.S" if DEBUG_PICOXCELL_UART + default "debug/sirf.S" if DEBUG_SIRFPRIMA2_UART1 || DEBUG_SIRFMARCO_UART1 default "debug/socfpga.S" if DEBUG_SOCFPGA_UART default "debug/sunxi.S" if DEBUG_SUNXI_UART0 || DEBUG_SUNXI_UART1 default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT || \