diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-12 07:37:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-12 07:37:59 -0700 |
| commit | 83d3d3c52468394419474d053df9dfe60d8f21c2 (patch) | |
| tree | 2d69c6c54c591c2732f283baedd374d57eb061fc /drivers/serial/sunzilog.c | |
| parent | 994bd4f9f5a065ead4a92435fdd928ac7fd33809 (diff) | |
| parent | ab5da288ce6a526a0a730362b8c4e03c3a0b58d5 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC32]: Fix sparc32 modpost warnings.
[SPARC32]: Fix sparc32 modpost warnings with sunzilog
[SPARC32]: Mark srmmu_nocache_init as __init.
[SPARC32]: pcic.c needs asm/irq_regs.h
Diffstat (limited to 'drivers/serial/sunzilog.c')
| -rw-r--r-- | drivers/serial/sunzilog.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c index 73dd2eedaaa..b2cc703b2b9 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 |