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

Commit 881787a7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-serial

parents 77b2555b 2d93486c

drivers/serial/21285.c

+1 −1
Original line number Diff line number Diff line
@@ -463,7 +463,7 @@ static int __init serial21285_console_setup(struct console *co, char *options) 
	return uart_set_options(port, co, baud, parity, bits, flow);

}



extern struct uart_driver serial21285_reg;

static struct uart_driver serial21285_reg;



static struct console serial21285_console =

{

drivers/serial/amba-pl010.c

+1 −1
Original line number Diff line number Diff line
@@ -689,7 +689,7 @@ static int __init pl010_console_setup(struct console *co, char *options) 
	return uart_set_options(port, co, baud, parity, bits, flow);

}



extern struct uart_driver amba_reg;

static struct uart_driver amba_reg;

static struct console amba_console = {

	.name		= "ttyAM",

	.write		= pl010_console_write,

drivers/serial/amba-pl011.c

+1 −1
Original line number Diff line number Diff line
@@ -701,7 +701,7 @@ static int __init pl011_console_setup(struct console *co, char *options) 
	return uart_set_options(&uap->port, co, baud, parity, bits, flow);

}



extern struct uart_driver amba_reg;

static struct uart_driver amba_reg;

static struct console amba_console = {

	.name		= "ttyAMA",

	.write		= pl011_console_write,

drivers/serial/clps711x.c

+1 −1
Original line number Diff line number Diff line
@@ -525,7 +525,7 @@ static int __init clps711xuart_console_setup(struct console *co, char *options) 
	return uart_set_options(port, co, baud, parity, bits, flow);

}



extern struct uart_driver clps711x_reg;

static struct uart_driver clps711x_reg;

static struct console clps711x_console = {

	.name		= "ttyCL",

	.write		= clps711xuart_console_write,

drivers/serial/pxa.c

+2 −2
Original line number Diff line number Diff line
@@ -589,8 +589,8 @@ serial_pxa_type(struct uart_port *port) 


#ifdef CONFIG_SERIAL_PXA_CONSOLE



extern struct uart_pxa_port serial_pxa_ports[];

extern struct uart_driver serial_pxa_reg;

static struct uart_pxa_port serial_pxa_ports[];

static struct uart_driver serial_pxa_reg;



#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE)