diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2007-07-11 00:20:01 +0100 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2007-07-12 17:41:07 +0100 |
| commit | ddfada5ac00647ed0e6091322acff9d615bf7497 (patch) | |
| tree | 839bc64cc5b952126fcb3d1ddf5f7128cb5556f5 | |
| parent | 96532151ff3567154cac92983b9edc3138fa097c (diff) | |
| download | linux-stable-ddfada5ac00647ed0e6091322acff9d615bf7497.tar.gz linux-stable-ddfada5ac00647ed0e6091322acff9d615bf7497.tar.bz2 linux-stable-ddfada5ac00647ed0e6091322acff9d615bf7497.zip | |
[MIPS] DEC: Fix modpost warning.
LD vmlinux
SYSMAP System.map
SYSMAP .tmp_System.map
MODPOST vmlinux
WARNING: drivers/built-in.o(.data+0x2480): Section mismatch: reference to .init.text: (between 'sercons' and 'ds_parms')
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| -rw-r--r-- | drivers/tc/zs.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/tc/zs.c b/drivers/tc/zs.c index 61de78a9f6ee..ed979f13908a 100644 --- a/drivers/tc/zs.c +++ b/drivers/tc/zs.c @@ -136,7 +136,7 @@ struct dec_serial *zs_chain; /* list of all channels */ struct tty_struct zs_ttys[NUM_CHANNELS]; #ifdef CONFIG_SERIAL_DEC_CONSOLE -static struct console sercons; +static struct console zs_console; #endif #if defined(CONFIG_SERIAL_DEC_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) && \ !defined(MODULE) @@ -383,7 +383,7 @@ static void receive_chars(struct dec_serial *info) #if defined(CONFIG_SERIAL_DEC_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) && \ !defined(MODULE) - if (break_pressed && info->line == sercons.index) { + if (break_pressed && info->line == zs_console.index) { /* Ignore the null char got when BREAK is removed. */ if (ch == 0) continue; @@ -446,7 +446,7 @@ static void status_handle(struct dec_serial *info) if ((stat & BRK_ABRT) && !(info->read_reg_zero & BRK_ABRT)) { #if defined(CONFIG_SERIAL_DEC_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) && \ !defined(MODULE) - if (info->line == sercons.index) { + if (info->line == zs_console.index) { if (!break_pressed) break_pressed = jiffies; } else @@ -1557,9 +1557,9 @@ static int rs_open(struct tty_struct *tty, struct file * filp) } #ifdef CONFIG_SERIAL_DEC_CONSOLE - if (sercons.cflag && sercons.index == line) { - tty->termios->c_cflag = sercons.cflag; - sercons.cflag = 0; + if (zs_console.cflag && zs_console.index == line) { + tty->termios->c_cflag = zs_console.cflag; + zs_console.cflag = 0; change_speed(info); } #endif @@ -2069,7 +2069,7 @@ static int __init serial_console_setup(struct console *co, char *options) return 0; } -static struct console sercons = { +static struct console zs_console = { .name = "ttyS", .write = serial_console_write, .device = serial_console_device, @@ -2083,7 +2083,7 @@ static struct console sercons = { */ void __init zs_serial_console_init(void) { - register_console(&sercons); + register_console(&zs_console); } #endif /* ifdef CONFIG_SERIAL_DEC_CONSOLE */ |