diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-13 16:38:02 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-13 16:38:02 -0700 |
| commit | 7b69a4c360e8787877ebf5e42609b8bab13afa6a (patch) | |
| tree | 3eaaae28ed398396f0f3f134e53dd8a730574781 /drivers/serial/dz.c | |
| parent | a23f4636c9ae7f1f15c448080f1552864b404136 (diff) | |
| parent | 68aa2c0d4a36b43ea9c6d77134c94b4501fd2eb4 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
* master.kernel.org:/home/rmk/linux-2.6-serial:
[SERIAL] 8250: sysrq deadlock fix
[SERIAL] 8250: add tsi108 serial support
[SERIAL] IP22: fix serial console hangs
[SERIAL] dz: Fix compilation error
Diffstat (limited to 'drivers/serial/dz.c')
| -rw-r--r-- | drivers/serial/dz.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/dz.c b/drivers/serial/dz.c index d119c8296a7..8a98aae80e2 100644 --- a/drivers/serial/dz.c +++ b/drivers/serial/dz.c @@ -673,7 +673,7 @@ static void dz_reset(struct dz_port *dport) } #ifdef CONFIG_SERIAL_DZ_CONSOLE -static void dz_console_putchar(struct uart_port *port, int ch) +static void dz_console_putchar(struct uart_port *uport, int ch) { struct dz_port *dport = (struct dz_port *)uport; unsigned long flags; |