Messages in this thread Patch in this message | | | Date | Sat, 7 Jan 2012 13:48:31 +0800 | From | Shawn Guo <> | Subject | Re: linux-next: manual merge of the arm-soc tree with the arm tree |
| |
On Fri, Jan 06, 2012 at 12:03:45PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the arm-soc tree got a conflict in > arch/arm/mach-imx/mm-imx5.c between commit 9bdd46257ab3 ("ARM: plat-mxc: > hook special idle handlers to arm_pm_idle") from the arm tree and commit > 010dc8af8f28 ("ARM: mx5: use generic irq chip pm interface for pm > functions on") from the arm-soc tree. > > I fixed it up (I think - see below) and can carry the fix as necessary.
Hi Stephen,
When I was testing this fix on next-20120106, I spotted another compile error from this file.
CC arch/arm/mach-imx/mm-imx5.o arch/arm/mach-imx/mm-imx5.c:58:24: error: redefinition of ‘mx50_io_desc’ arch/arm/mach-imx/mm-imx5.c:48:24: note: previous definition of ‘mx50_io_desc’ was here arch/arm/mach-imx/mm-imx5.c:48:24: warning: ‘mx50_io_desc’ defined but not used
The fix could just be removing the duplication.
-- Regards, Shawn
8<---- @@ -53,16 +54,6 @@ static struct map_desc mx50_io_desc[] __initdata = { };
/* - * Define the MX50 memory map. - */ -static struct map_desc mx50_io_desc[] __initdata = { - imx_map_entry(MX50, TZIC, MT_DEVICE), - imx_map_entry(MX50, SPBA0, MT_DEVICE), - imx_map_entry(MX50, AIPS1, MT_DEVICE), - imx_map_entry(MX50, AIPS2, MT_DEVICE), -}; - -/* -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |