diff options
| author |   Guenter Roeck <linux@roeck-us.net> | 2015-11-10 14:04:35 -0800 |
|---|---|---|
| committer |   Jesper Nilsson <jespern@axis.com> | 2015-12-15 14:03:11 +0100 |
| commit | 56edefc98a1c3c8124823ed45260c1c912f81bb3 (patch) | |
| tree | f882187037cce0be822230f936d5dcb13108abae /arch/cris/arch-v10 | |
| parent | Merge branch 'akpm' (patches from Andrew) (diff) | |
| download | linux-dev-56edefc98a1c3c8124823ed45260c1c912f81bb3.tar.xz linux-dev-56edefc98a1c3c8124823ed45260c1c912f81bb3.zip | |
cris: debugport: Fix section mismatches
Section mismatches can now cause build failures, such as for
cris:allnoconfig. Rename affected variables to end with _console
to make section mismatch checks happy.
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
Diffstat (limited to 'arch/cris/arch-v10')
| -rw-r--r-- | arch/cris/arch-v10/kernel/debugport.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/arch/cris/arch-v10/kernel/debugport.c b/arch/cris/arch-v10/kernel/debugport.c index 7d307cce8bd8..b6549e54be29 100644 --- a/arch/cris/arch-v10/kernel/debugport.c +++ b/arch/cris/arch-v10/kernel/debugport.c @@ -468,7 +468,7 @@ etrax_console_device(struct console* co, int *index) #endif } -static struct console sercons = { +static struct console ser_console = { name : "ttyS", write: console_write, read : NULL, @@ -480,7 +480,7 @@ static struct console sercons = { cflag : 0, next : NULL }; -static struct console sercons0 = { +static struct console ser0_console = { name : "ttyS", write: console_write, read : NULL, @@ -493,7 +493,7 @@ static struct console sercons0 = { next : NULL }; -static struct console sercons1 = { +static struct console ser1_console = { name : "ttyS", write: console_write, read : NULL, @@ -505,7 +505,7 @@ static struct console sercons1 = { cflag : 0, next : NULL }; -static struct console sercons2 = { +static struct console ser2_console = { name : "ttyS", write: console_write, read : NULL, @@ -517,7 +517,7 @@ static struct console sercons2 = { cflag : 0, next : NULL }; -static struct console sercons3 = { +static struct console ser3_console = { name : "ttyS", write: console_write, read : NULL, @@ -539,17 +539,17 @@ init_etrax_debug(void) static int first = 1; if (!first) { - unregister_console(&sercons); - register_console(&sercons0); - register_console(&sercons1); - register_console(&sercons2); - register_console(&sercons3); + unregister_console(&ser_console); + register_console(&ser0_console); + register_console(&ser1_console); + register_console(&ser2_console); + register_console(&ser3_console); init_dummy_console(); return 0; } first = 0; - register_console(&sercons); + register_console(&ser_console); start_port(port); #ifdef CONFIG_ETRAX_KGDB start_port(kgdb_port); |