[ARM] 3268/1: AT91RM9200 serial update for 2.6.15-git12

Patch from Andrew Victor

This patch fixes two small issues with 2.6.15-git12.

1) Corrected major/minor numbers for ttyAT devices in the KConfig help.
   (Patch from Karl Olsen)

2) tty->flip.count has been removed.

Signed-off-by: Andrew Victor <andrew@sanpeople.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig
index 5e7199f7b59cda1e9a45da991c2ebc92e0ce4fe8..9fd1925de3611feba30e95ef035d01e6658863e4 100644 (file)
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -301,7 +301,7 @@ config SERIAL_AT91_TTYAT
        depends on SERIAL_AT91=y
        help
          Say Y here if you wish to have the five internal AT91RM9200 UARTs
-         appear as /dev/ttyAT0-4 (major 240, minor 0-4) instead of the
+         appear as /dev/ttyAT0-4 (major 204, minor 154-158) instead of the
          normal /dev/ttyS0-4 (major 4, minor 64-68). This is necessary if
          you also want other UARTs, such as external 8250/16C550 compatible
          UARTs.

diff --git a/drivers/serial/at91_serial.c b/drivers/serial/at91_serial.c
index 0e206063d68580925d3794533ec5703986653c07..2113feb75c39890f6687d64ec80c88b3b56346f9 100644 (file)
--- a/drivers/serial/at91_serial.c
+++ b/drivers/serial/at91_serial.c
@@ -222,8 +222,6 @@ static void at91_rx_chars(struct uart_port *port, struct pt_regs *regs)
        while (status & (AT91_US_RXRDY)) {
                ch = UART_GET_CHAR(port);
 
-               if (tty->flip.count >= TTY_FLIPBUF_SIZE)
-                       goto ignore_char;
                port->icount.rx++;
 
                flg = TTY_NORMAL;