Merge tag 'tty-3.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

Pull tty/serial bugfixes from Greg KH:
 "Here are some tty / serial driver bugfixes for 3.16-rc2 that resolve
  some reported issues.  The samsung driver build error itself has been
  reported by a bunch of people, sorry about that one.  The others are
  all tiny and everyone seems to like them in linux-next so far"

* tag 'tty-3.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  tty/serial: fix 8250 early console option passing to regular console
  tty: Correct INPCK handling
  serial: Fix IGNBRK handling
  serial: samsung: Fix build error

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/tty/serial/sirfsoc_uart.c b/drivers/tty/serial/sirfsoc_uart.c
index 1f2be48c92ce..9b4d71cff00d 100644
--- a/drivers/tty/serial/sirfsoc_uart.c
+++ b/drivers/tty/serial/sirfsoc_uart.c
@@ -896,7 +896,7 @@ static void sirfsoc_uart_set_termios(struct uart_port *port,
                 if (termios->c_iflag & INPCK)
                         port->read_status_mask |= uint_en->sirfsoc_frm_err_en;
         }
-        if (termios->c_iflag & (BRKINT | PARMRK))
+        if (termios->c_iflag & (IGNBRK | BRKINT | PARMRK))
                         port->read_status_mask |= uint_en->sirfsoc_rxd_brk_en;
         if (sirfport->uart_reg->uart_type == SIRF_REAL_UART) {
                 if (termios->c_iflag & IGNPAR)