diff options
| author | Paul Walmsley <paul@pwsan.com> | 2012-09-23 19:15:44 -0400 |
|---|---|---|
| committer | Paul Walmsley <paul@pwsan.com> | 2012-09-23 19:15:44 -0400 |
| commit | 291852e8791a596195edc3ced96481bfd105f35b (patch) | |
| tree | 5ac0d7f65cc21943863301fc50e62a616b168e8d /drivers/tty/serial/bfin_uart.c | |
| parent | 2910f14584eddf2bc0db4baec3c6950ef357b52c (diff) | |
| parent | de6ca33a96a6bf61fcb91d3d399703e19ead9d1e (diff) | |
Merge tag 'cleanup-fixes-for-v3.7' into test_v3.6-rc6_ocb3.7_cff3.7_odaf3.7
These fixes are needed to fix non-omap build breakage for
twl-core driver and to fix omap1_defconfig compile when
led driver changes and omap sparse IRQ changes are merged
together. Also fix warnings for omaps not using pinctrl
framework yet.
Diffstat (limited to 'drivers/tty/serial/bfin_uart.c')
| -rw-r--r-- | drivers/tty/serial/bfin_uart.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/serial/bfin_uart.c b/drivers/tty/serial/bfin_uart.c index bd97db23985b..9242d56ba267 100644 --- a/drivers/tty/serial/bfin_uart.c +++ b/drivers/tty/serial/bfin_uart.c | |||
| @@ -182,7 +182,7 @@ static void bfin_serial_start_tx(struct uart_port *port) | |||
| 182 | * To avoid losting RX interrupt, we reset IR function | 182 | * To avoid losting RX interrupt, we reset IR function |
| 183 | * before sending data. | 183 | * before sending data. |
| 184 | */ | 184 | */ |
| 185 | if (tty->termios->c_line == N_IRDA) | 185 | if (tty->termios.c_line == N_IRDA) |
| 186 | bfin_serial_reset_irda(port); | 186 | bfin_serial_reset_irda(port); |
| 187 | 187 | ||
| 188 | #ifdef CONFIG_SERIAL_BFIN_DMA | 188 | #ifdef CONFIG_SERIAL_BFIN_DMA |