diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-01-27 23:45:22 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-01-27 23:45:22 +0000 |
| commit | 5b35aa5cd29bb111d847b2a2ed18110acbfb1f44 (patch) | |
| tree | c7bbaa1137528330d3c74d14056ef7016a52be72 /drivers/macintosh | |
| parent | 511bcd7c5924ce9e98ad1cb851988f7448dfef0f (diff) | |
Merge with Linux 2.3.24.
Diffstat (limited to 'drivers/macintosh')
| -rw-r--r-- | drivers/macintosh/macserial.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/macintosh/macserial.c b/drivers/macintosh/macserial.c index 720932cc9..39a27107f 100644 --- a/drivers/macintosh/macserial.c +++ b/drivers/macintosh/macserial.c @@ -2584,7 +2584,9 @@ void unregister_serial(int line) * ------------------------------------------------------------ */ #ifdef CONFIG_SERIAL_CONSOLE - +#ifdef CONFIG_SERIAL +#error Cannot build serial console with macserial and serial drivers +#endif /* * Print a string to the serial port trying not to disturb @@ -2843,7 +2845,7 @@ static struct console sercons = { /* * Register console. */ -long __init serial_console_init(long kmem_start, long kmem_end) +void __init serial_console_init(void) { register_console(&sercons); return kmem_start; |