Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6

[mv-sheeva.git] / drivers / serial / dz.c

diff --git a/drivers/serial/dz.c b/drivers/serial/dz.c
index d119c8296a78a96d69e697a61b7c60ebb96670d9..53662b33b84164c9f023033a3cdbb7d4dcd5b429 100644 (file)
--- a/drivers/serial/dz.c
+++ b/drivers/serial/dz.c
@@ -339,7 +339,7 @@ static inline void check_modem_status(struct dz_port *dport)
  * It deals with the multiple ports.
  * ------------------------------------------------------------
  */
-static irqreturn_t dz_interrupt(int irq, void *dev, struct pt_regs *regs)
+static irqreturn_t dz_interrupt(int irq, void *dev)
 {
        struct dz_port *dport;
        unsigned short status;
@@ -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;