From 2d6329071ab90ed5bb8a87a5c74f346b15b8b713 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Mon, 7 May 2007 00:14:13 -0700 Subject: [PATCH] --- yaml --- r: 54410 b: refs/heads/master c: 90a660a4546d6ba5ca5f3a23d5cc599db2b41e08 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/serial/sunsu.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a0fec7732d88..b6a3162020f7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e7f11aeed02767541020984f72f823757c58e48e +refs/heads/master: 90a660a4546d6ba5ca5f3a23d5cc599db2b41e08 diff --git a/trunk/drivers/serial/sunsu.c b/trunk/drivers/serial/sunsu.c index bfd44177a215..2a63cdba3208 100644 --- a/trunk/drivers/serial/sunsu.c +++ b/trunk/drivers/serial/sunsu.c @@ -1312,7 +1312,7 @@ static void sunsu_console_write(struct console *co, const char *s, * - initialize the serial port * Return non-zero if we didn't find a serial port. */ -static int sunsu_console_setup(struct console *co, char *options) +static int __init sunsu_console_setup(struct console *co, char *options) { struct uart_port *port; int baud = 9600; @@ -1343,7 +1343,7 @@ static int sunsu_console_setup(struct console *co, char *options) return uart_set_options(port, co, baud, parity, bits, flow); } -static struct console sunsu_cons = { +static struct console sunsu_console = { .name = "ttyS", .write = sunsu_console_write, .device = uart_console_device, @@ -1373,9 +1373,9 @@ static inline struct console *SUNSU_CONSOLE(int num_uart) if (i == num_uart) return NULL; - sunsu_cons.index = i; + sunsu_console.index = i; - return &sunsu_cons; + return &sunsu_console; } #else #define SUNSU_CONSOLE(num_uart) (NULL)