diff options
| author | Linus Torvalds | 2006-01-19 00:18:53 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2006-01-19 00:18:53 +0100 |
| commit | 2333f2120759bb2a3edcc0d32b2f310048ee610d (patch) | |
| tree | 9dfd3df0d0702c45fbfdff00f5b5038de01301c5 /drivers | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-upstream (diff) | |
| download | kernel-qcow2-linux-2333f2120759bb2a3edcc0d32b2f310048ee610d.tar.gz kernel-qcow2-linux-2333f2120759bb2a3edcc0d32b2f310048ee610d.tar.xz kernel-qcow2-linux-2333f2120759bb2a3edcc0d32b2f310048ee610d.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/serial/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/serial/at91_serial.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index 5e7199f7b59c..9fd1925de361 100644 --- 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 0e206063d685..2113feb75c39 100644 --- 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; |