The patch titled Subject: serial/imx: fix IMX UART macro usage to reflect correct has been added to the -mm tree. Its filename is serial-imx-fix-imx-uart-macro-usage-to-reflect-correct.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** The -mm tree is included into linux-next and is updated there every 3-4 working days ------------------------------------------------------ From: "Oskar Schirmer" <oskar@xxxxxxxxx> Subject: serial/imx: fix IMX UART macro usage to reflect correct Platform dependant UART data refers to MX31 macro for MX35 machines. For all other machines, macro usage matches machine type. Though this compiles out to the same result, it looks much like a typo, so fix it to use the right macros instead. Signed-off-by: Oskar Schirmer <oskar@xxxxxxxxx> Acked-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxxxx> Cc: Sascha Hauer <kernel@xxxxxxxxxxxxxx> Cc: Russell King <linux@xxxxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/arm/plat-mxc/devices/platform-imx-uart.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN arch/arm/plat-mxc/devices/platform-imx-uart.c~serial-imx-fix-imx-uart-macro-usage-to-reflect-correct arch/arm/plat-mxc/devices/platform-imx-uart.c --- a/arch/arm/plat-mxc/devices/platform-imx-uart.c~serial-imx-fix-imx-uart-macro-usage-to-reflect-correct +++ a/arch/arm/plat-mxc/devices/platform-imx-uart.c @@ -87,7 +87,7 @@ const struct imx_imx_uart_1irq_data imx3 #ifdef CONFIG_SOC_IMX35 const struct imx_imx_uart_1irq_data imx35_imx_uart_data[] __initconst = { #define imx35_imx_uart_data_entry(_id, _hwid) \ - imx_imx_uart_1irq_data_entry(MX31, _id, _hwid, SZ_16K) + imx_imx_uart_1irq_data_entry(MX35, _id, _hwid, SZ_16K) imx35_imx_uart_data_entry(0, 1), imx35_imx_uart_data_entry(1, 2), imx35_imx_uart_data_entry(2, 3), _ Patches currently in -mm which might be from oskar@xxxxxxxxx are linux-next.patch serial-imx-fix-imx-uart-macro-usage-to-reflect-correct.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html