* Phil Carmody <phil.carmody@xxxxxxxxxxxxxxxxxxx> [130909 06:25]:
> Signed-off-by: Phil Carmody <phil.carmody@xxxxxxxxxxxxxxxxxxx>
Thanks applying into omap-for-v3.12/fixes.
Tony
> arch/arm/mach-omap2/mux34xx.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/mach-omap2/mux34xx.c b/arch/arm/mach-omap2/mux34xx.c
> index c53609f4..be271f1 100644
> --- a/arch/arm/mach-omap2/mux34xx.c
> +++ b/arch/arm/mach-omap2/mux34xx.c
> @@ -620,7 +620,7 @@ static struct omap_mux __initdata omap3_muxmodes[] = {
> "uart1_rts", "ssi1_flag_tx", NULL, NULL,
> "gpio_149", NULL, NULL, "safe_mode"),
> _OMAP3_MUXENTRY(UART1_RX, 151,
> - "uart1_rx", "ss1_wake_tx", "mcbsp1_clkr", "mcspi4_clk",
> + "uart1_rx", "ssi1_wake_tx", "mcbsp1_clkr", "mcspi4_clk",
> "gpio_151", NULL, NULL, "safe_mode"),
> _OMAP3_MUXENTRY(UART1_TX, 148,
> "uart1_tx", "ssi1_dat_tx", NULL, NULL,
> --
> 1.7.9.5
>
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
