Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1230b404 authored by Andrew Victor's avatar Andrew Victor Committed by Russell King
Browse files

[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: default avatarAndrew Victor <andrew@sanpeople.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 68477d11

drivers/serial/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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.

drivers/serial/at91_serial.c

+0 −2
Original line number Diff line number Diff line
@@ -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;