diff options
Diffstat (limited to 'drivers/serial')
-rw-r--r-- | drivers/serial/sunsu.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c index bfd44177a215..2a63cdba3208 100644 --- a/drivers/serial/sunsu.c +++ b/drivers/serial/sunsu.c | |||
@@ -1312,7 +1312,7 @@ static void sunsu_console_write(struct console *co, const char *s, | |||
1312 | * - initialize the serial port | 1312 | * - initialize the serial port |
1313 | * Return non-zero if we didn't find a serial port. | 1313 | * Return non-zero if we didn't find a serial port. |
1314 | */ | 1314 | */ |
1315 | static int sunsu_console_setup(struct console *co, char *options) | 1315 | static int __init sunsu_console_setup(struct console *co, char *options) |
1316 | { | 1316 | { |
1317 | struct uart_port *port; | 1317 | struct uart_port *port; |
1318 | int baud = 9600; | 1318 | int baud = 9600; |
@@ -1343,7 +1343,7 @@ static int sunsu_console_setup(struct console *co, char *options) | |||
1343 | return uart_set_options(port, co, baud, parity, bits, flow); | 1343 | return uart_set_options(port, co, baud, parity, bits, flow); |
1344 | } | 1344 | } |
1345 | 1345 | ||
1346 | static struct console sunsu_cons = { | 1346 | static struct console sunsu_console = { |
1347 | .name = "ttyS", | 1347 | .name = "ttyS", |
1348 | .write = sunsu_console_write, | 1348 | .write = sunsu_console_write, |
1349 | .device = uart_console_device, | 1349 | .device = uart_console_device, |
@@ -1373,9 +1373,9 @@ static inline struct console *SUNSU_CONSOLE(int num_uart) | |||
1373 | if (i == num_uart) | 1373 | if (i == num_uart) |
1374 | return NULL; | 1374 | return NULL; |
1375 | 1375 | ||
1376 | sunsu_cons.index = i; | 1376 | sunsu_console.index = i; |
1377 | 1377 | ||
1378 | return &sunsu_cons; | 1378 | return &sunsu_console; |
1379 | } | 1379 | } |
1380 | #else | 1380 | #else |
1381 | #define SUNSU_CONSOLE(num_uart) (NULL) | 1381 | #define SUNSU_CONSOLE(num_uart) (NULL) |