Merge master.kernel.org:/home/rmk/linux-2.6-serial
This commit is contained in:
commit
881787a7d3
|
@ -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 =
|
||||
{
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
|
|
@ -799,7 +799,7 @@ sa1100_console_setup(struct console *co, char *options)
|
|||
return uart_set_options(&sport->port, co, baud, parity, bits, flow);
|
||||
}
|
||||
|
||||
extern struct uart_driver sa1100_reg;
|
||||
static struct uart_driver sa1100_reg;
|
||||
static struct console sa1100_console = {
|
||||
.name = "ttySA",
|
||||
.write = sa1100_console_write,
|
||||
|
|
|
@ -632,7 +632,7 @@ static int __init lh7a40xuart_console_setup (struct console* co, char* options)
|
|||
return uart_set_options (port, co, baud, parity, bits, flow);
|
||||
}
|
||||
|
||||
extern struct uart_driver lh7a40x_reg;
|
||||
static struct uart_driver lh7a40x_reg;
|
||||
static struct console lh7a40x_console = {
|
||||
.name = "ttyAM",
|
||||
.write = lh7a40xuart_console_write,
|
||||
|
|
Loading…
Reference in a new issue