Merge mulgrave-w:git/scsi-misc-2.6

[deliverable/linux.git] / drivers / serial / dz.c

diff --git a/drivers/serial/dz.c b/drivers/serial/dz.c
index d119c8296a78a96d69e697a61b7c60ebb96670d9..8a98aae80e228ffd8afc2c57b868b8394aa7d765 100644 (file)
--- 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;