diff options
Diffstat (limited to 'drivers/serial')
-rw-r--r-- | drivers/serial/suncore.c | 6 | ||||
-rw-r--r-- | drivers/serial/sunzilog.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/serial/suncore.c b/drivers/serial/suncore.c index e35d9ab359f1..b45ba5392dd3 100644 --- a/drivers/serial/suncore.c +++ b/drivers/serial/suncore.c | |||
@@ -30,9 +30,9 @@ void | |||
30 | sunserial_console_termios(struct console *con) | 30 | sunserial_console_termios(struct console *con) |
31 | { | 31 | { |
32 | char mode[16], buf[16], *s; | 32 | char mode[16], buf[16], *s; |
33 | char *mode_prop = "ttyX-mode"; | 33 | char mode_prop[] = "ttyX-mode"; |
34 | char *cd_prop = "ttyX-ignore-cd"; | 34 | char cd_prop[] = "ttyX-ignore-cd"; |
35 | char *dtr_prop = "ttyX-rts-dtr-off"; | 35 | char dtr_prop[] = "ttyX-rts-dtr-off"; |
36 | char *ssp_console_modes_prop = "ssp-console-modes"; | 36 | char *ssp_console_modes_prop = "ssp-console-modes"; |
37 | int baud, bits, stop, cflag; | 37 | int baud, bits, stop, cflag; |
38 | char parity; | 38 | char parity; |
diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c index 0985193dc57d..15b6e1cb040b 100644 --- a/drivers/serial/sunzilog.c +++ b/drivers/serial/sunzilog.c | |||
@@ -1239,7 +1239,7 @@ static inline struct console *SUNZILOG_CONSOLE(void) | |||
1239 | #define SUNZILOG_CONSOLE() (NULL) | 1239 | #define SUNZILOG_CONSOLE() (NULL) |
1240 | #endif | 1240 | #endif |
1241 | 1241 | ||
1242 | static void __init sunzilog_init_kbdms(struct uart_sunzilog_port *up, int channel) | 1242 | static void __devinit sunzilog_init_kbdms(struct uart_sunzilog_port *up, int channel) |
1243 | { | 1243 | { |
1244 | int baud, brg; | 1244 | int baud, brg; |
1245 | 1245 | ||
@@ -1259,7 +1259,7 @@ static void __init sunzilog_init_kbdms(struct uart_sunzilog_port *up, int channe | |||
1259 | } | 1259 | } |
1260 | 1260 | ||
1261 | #ifdef CONFIG_SERIO | 1261 | #ifdef CONFIG_SERIO |
1262 | static void __init sunzilog_register_serio(struct uart_sunzilog_port *up) | 1262 | static void __devinit sunzilog_register_serio(struct uart_sunzilog_port *up) |
1263 | { | 1263 | { |
1264 | struct serio *serio = &up->serio; | 1264 | struct serio *serio = &up->serio; |
1265 | 1265 | ||