[SPARC32]: Fix sparc32 modpost warnings with sunzilog

Fix this 2.6.19-rc1 build warnings from modpost:

WARNING: vmlinux - Section mismatch: reference to .init.text:sunzilog_console_setup from .data between 'sunzilog_console' (at offset 0x8394) and 'devices_subsys'

Signed-off-by: Martin Habets <errandir_news@mph.eclipse.co.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 3 insertions, 23 deletions

diff --git a/arch/sparc/kernel/setup.c b/arch/sparc/kernel/setup.c
index 0251cab4708b..f5ee1ac834bc 100644
--- a/arch/sparc/kernel/setup.c
+++ b/arch/sparc/kernel/setup.c
@@ -121,16 +121,6 @@ static struct console prom_debug_console = {
         .index =        -1,
 };
 
-int obp_system_intr(void)
-{
-        if (boot_flags & BOOTME_DEBUG) {
-                printk("OBP: system interrupted\n");
-                prom_halt();
-                return 1;
-        }
-        return 0;
-}
-
 /* 
  * Process kernel command line switches that are specific to the
  * SPARC or that require special low-level processing.
diff --git a/arch/sparc64/kernel/setup.c b/arch/sparc64/kernel/setup.c
index 958287448cfe..cc8ad480a204 100644
--- a/arch/sparc64/kernel/setup.c
+++ b/arch/sparc64/kernel/setup.c
@@ -91,16 +91,6 @@ void kernel_enter_debugger(void)
 {
 }
 
-int obp_system_intr(void)
-{
-        if (boot_flags & BOOTME_DEBUG) {
-                printk("OBP: system interrupted\n");
-                prom_halt();
-                return 1;
-        }
-        return 0;
-}
-
 /* 
  * Process kernel command line switches that are specific to the
  * SPARC or that require special low-level processing.
diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c
index 73dd2eedaaad..b2cc703b2b9e 100644
--- a/drivers/serial/sunzilog.c
+++ b/drivers/serial/sunzilog.c
@@ -1182,7 +1182,7 @@ static int __init sunzilog_console_setup(struct console *con, char *options)
         return 0;
 }
 
-static struct console sunzilog_console = {
+static struct console sunzilog_console_ops = {
         .name   =       "ttyS",
         .write  =       sunzilog_console_write,
         .device =       uart_console_device,
@@ -1208,10 +1208,10 @@ static inline struct console *SUNZILOG_CONSOLE(void)
         if (i == NUM_CHANNELS)
                 return NULL;
 
-        sunzilog_console.index = i;
+        sunzilog_console_ops.index = i;
         sunzilog_port_table[i].flags |= SUNZILOG_FLAG_IS_CONS;
 
-        return &sunzilog_console;
+        return &sunzilog_console_ops;
 }
 
 #else