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>

diff --git a/arch/cris/arch-v10/kernel/debugport.c b/arch/cris/arch-v10/kernel/debugport.c
index 7d307cc..b6549e5 100644 (file)
--- 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);