diff options
author | Paul Mundt <lethal@linux-sh.org> | 2007-09-11 02:27:29 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2007-09-20 22:57:53 -0400 |
commit | 68362e0857ecf8a9da1ac5f7abceafbcfaa969d7 (patch) | |
tree | c033374a749c3e23afe16516b9fcf68c5e272d03 /drivers/serial/sh-sci.c | |
parent | c9eaaa9763702bdeac5ac5f790dcebafbada44bb (diff) |
serial: sh-sci: kgdb console build fixes.
The kgdb console code requires uart_set_options() and friends, which
are only provided by the serial core when console support is enabled.
These were sitting under CONFIG_SH_KGDB and resulted in a link error
when console support wasn't enabled, work that by rolling the console
routines under CONFIG_SH_KGDB_CONSOLE, which they should have been
all along.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/serial/sh-sci.c')
-rw-r--r-- | drivers/serial/sh-sci.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c index 81318c580e22..73440e26834b 100644 --- a/drivers/serial/sh-sci.c +++ b/drivers/serial/sh-sci.c | |||
@@ -1309,7 +1309,7 @@ static int __init sci_console_init(void) | |||
1309 | console_initcall(sci_console_init); | 1309 | console_initcall(sci_console_init); |
1310 | #endif /* CONFIG_SERIAL_SH_SCI_CONSOLE */ | 1310 | #endif /* CONFIG_SERIAL_SH_SCI_CONSOLE */ |
1311 | 1311 | ||
1312 | #ifdef CONFIG_SH_KGDB | 1312 | #ifdef CONFIG_SH_KGDB_CONSOLE |
1313 | /* | 1313 | /* |
1314 | * FIXME: Most of this can go away.. at the moment, we rely on | 1314 | * FIXME: Most of this can go away.. at the moment, we rely on |
1315 | * arch/sh/kernel/setup.c to do the command line parsing for kgdb, though | 1315 | * arch/sh/kernel/setup.c to do the command line parsing for kgdb, though |
@@ -1367,9 +1367,7 @@ int __init kgdb_console_setup(struct console *co, char *options) | |||
1367 | 1367 | ||
1368 | return uart_set_options(port, co, baud, parity, bits, flow); | 1368 | return uart_set_options(port, co, baud, parity, bits, flow); |
1369 | } | 1369 | } |
1370 | #endif /* CONFIG_SH_KGDB */ | ||
1371 | 1370 | ||
1372 | #ifdef CONFIG_SH_KGDB_CONSOLE | ||
1373 | static struct console kgdb_console = { | 1371 | static struct console kgdb_console = { |
1374 | .name = "ttySC", | 1372 | .name = "ttySC", |
1375 | .device = uart_console_device, | 1373 | .device = uart_console_device, |