Merge branch 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm

[sfrench/cifs-2.6.git] / drivers / pinctrl / pinctrl-xway.c

diff --git a/drivers/pinctrl/pinctrl-xway.c b/drivers/pinctrl/pinctrl-xway.c
index d4167e2c173ae054d60ba7489e8db9395771e184..f9e98a7d4f0ce088617a4bd4bf90511793809941 100644 (file)
--- a/drivers/pinctrl/pinctrl-xway.c
+++ b/drivers/pinctrl/pinctrl-xway.c
@@ -1028,7 +1028,7 @@ static const struct ltq_pin_group xrx200_grps[] = {
        GRP_MUX("spi_cs5", SPI, xrx200_pins_spi_cs5),
        GRP_MUX("spi_cs6", SPI, xrx200_pins_spi_cs6),
        GRP_MUX("usif uart_rx", USIF, xrx200_pins_usif_uart_rx),
-       GRP_MUX("usif uart_rx", USIF, xrx200_pins_usif_uart_tx),
+       GRP_MUX("usif uart_tx", USIF, xrx200_pins_usif_uart_tx),
        GRP_MUX("usif uart_rts", USIF, xrx200_pins_usif_uart_rts),
        GRP_MUX("usif uart_cts", USIF, xrx200_pins_usif_uart_cts),
        GRP_MUX("usif uart_dtr", USIF, xrx200_pins_usif_uart_dtr),