Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 83831
b: refs/heads/master
c: 6d83c06
h: refs/heads/master
i:
  83829: 420bd78
  83827: 0e74d4c
  83823: bf9ea56
v: v3
  • Loading branch information
Maciej W. Rozycki authored and Linus Torvalds committed Feb 7, 2008
1 parent 02e1ef2 commit 6718162
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7287d765d5f2e946fdffbcba36088c44ebb35912
refs/heads/master: 6d83c067ebd11d375b34c53192c10826947e8568
6 changes: 3 additions & 3 deletions trunk/drivers/serial/dz.c
Original file line number Diff line number Diff line change
Expand Up @@ -744,7 +744,7 @@ static int __init dz_console_setup(struct console *co, char *options)
}

static struct uart_driver dz_reg;
static struct console dz_sercons = {
static struct console dz_console = {
.name = "ttyS",
.write = dz_console_print,
.device = uart_console_device,
Expand All @@ -758,15 +758,15 @@ static int __init dz_serial_console_init(void)
{
if (!IOASIC) {
dz_init_ports();
register_console(&dz_sercons);
register_console(&dz_console);
return 0;
} else
return -ENXIO;
}

console_initcall(dz_serial_console_init);

#define SERIAL_DZ_CONSOLE &dz_sercons
#define SERIAL_DZ_CONSOLE &dz_console
#else
#define SERIAL_DZ_CONSOLE NULL
#endif /* CONFIG_SERIAL_DZ_CONSOLE */
Expand Down

0 comments on commit 6718162

Please sign in to comment.