diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2007-07-10 19:20:01 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2007-07-12 12:41:07 -0400 |
commit | ddfada5ac00647ed0e6091322acff9d615bf7497 (patch) | |
tree | 839bc64cc5b952126fcb3d1ddf5f7128cb5556f5 | |
parent | 96532151ff3567154cac92983b9edc3138fa097c (diff) |
[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 */ | |||
136 | struct tty_struct zs_ttys[NUM_CHANNELS]; | 136 | struct tty_struct zs_ttys[NUM_CHANNELS]; |
137 | 137 | ||
138 | #ifdef CONFIG_SERIAL_DEC_CONSOLE | 138 | #ifdef CONFIG_SERIAL_DEC_CONSOLE |
139 | static struct console sercons; | 139 | static struct console zs_console; |
140 | #endif | 140 | #endif |
141 | #if defined(CONFIG_SERIAL_DEC_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) && \ | 141 | #if defined(CONFIG_SERIAL_DEC_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) && \ |
142 | !defined(MODULE) | 142 | !defined(MODULE) |
@@ -383,7 +383,7 @@ static void receive_chars(struct dec_serial *info) | |||
383 | 383 | ||
384 | #if defined(CONFIG_SERIAL_DEC_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) && \ | 384 | #if defined(CONFIG_SERIAL_DEC_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) && \ |
385 | !defined(MODULE) | 385 | !defined(MODULE) |
386 | if (break_pressed && info->line == sercons.index) { | 386 | if (break_pressed && info->line == zs_console.index) { |
387 | /* Ignore the null char got when BREAK is removed. */ | 387 | /* Ignore the null char got when BREAK is removed. */ |
388 | if (ch == 0) | 388 | if (ch == 0) |
389 | continue; | 389 | continue; |
@@ -446,7 +446,7 @@ static void status_handle(struct dec_serial *info) | |||
446 | if ((stat & BRK_ABRT) && !(info->read_reg_zero & BRK_ABRT)) { | 446 | if ((stat & BRK_ABRT) && !(info->read_reg_zero & BRK_ABRT)) { |
447 | #if defined(CONFIG_SERIAL_DEC_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) && \ | 447 | #if defined(CONFIG_SERIAL_DEC_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) && \ |
448 | !defined(MODULE) | 448 | !defined(MODULE) |
449 | if (info->line == sercons.index) { | 449 | if (info->line == zs_console.index) { |
450 | if (!break_pressed) | 450 | if (!break_pressed) |
451 | break_pressed = jiffies; | 451 | break_pressed = jiffies; |
452 | } else | 452 | } else |
@@ -1557,9 +1557,9 @@ static int rs_open(struct tty_struct *tty, struct file * filp) | |||
1557 | } | 1557 | } |
1558 | 1558 | ||
1559 | #ifdef CONFIG_SERIAL_DEC_CONSOLE | 1559 | #ifdef CONFIG_SERIAL_DEC_CONSOLE |
1560 | if (sercons.cflag && sercons.index == line) { | 1560 | if (zs_console.cflag && zs_console.index == line) { |
1561 | tty->termios->c_cflag = sercons.cflag; | 1561 | tty->termios->c_cflag = zs_console.cflag; |
1562 | sercons.cflag = 0; | 1562 | zs_console.cflag = 0; |
1563 | change_speed(info); | 1563 | change_speed(info); |
1564 | } | 1564 | } |
1565 | #endif | 1565 | #endif |
@@ -2069,7 +2069,7 @@ static int __init serial_console_setup(struct console *co, char *options) | |||
2069 | return 0; | 2069 | return 0; |
2070 | } | 2070 | } |
2071 | 2071 | ||
2072 | static struct console sercons = { | 2072 | static struct console zs_console = { |
2073 | .name = "ttyS", | 2073 | .name = "ttyS", |
2074 | .write = serial_console_write, | 2074 | .write = serial_console_write, |
2075 | .device = serial_console_device, | 2075 | .device = serial_console_device, |
@@ -2083,7 +2083,7 @@ static struct console sercons = { | |||
2083 | */ | 2083 | */ |
2084 | void __init zs_serial_console_init(void) | 2084 | void __init zs_serial_console_init(void) |
2085 | { | 2085 | { |
2086 | register_console(&sercons); | 2086 | register_console(&zs_console); |
2087 | } | 2087 | } |
2088 | #endif /* ifdef CONFIG_SERIAL_DEC_CONSOLE */ | 2088 | #endif /* ifdef CONFIG_SERIAL_DEC_CONSOLE */ |
2089 | 2089 | ||