Merge 3.10-rc5 into tty-next

This commit is contained in:
Greg Kroah-Hartman
2013-06-08 21:23:33 -07:00
480 changed files with 6912 additions and 3074 deletions

View File

@@ -787,6 +787,8 @@ static int imx_startup(struct uart_port *port)
temp = readl(sport->port.membase + UCR2);
temp |= (UCR2_RXEN | UCR2_TXEN);
if (!sport->have_rtscts)
temp |= UCR2_IRTS;
writel(temp, sport->port.membase + UCR2);
if (USE_IRDA(sport)) {