Fix compile errors in SGI console drivers (linux-next tree)

[linux-2.6-omap-h63xx.git] / drivers / serial / v850e_uart.c

diff --git a/drivers/serial/v850e_uart.c b/drivers/serial/v850e_uart.c
index df705fda42436f392308138a2634ddb4628998f6..5acf061b6cd295f054edd5c2b06a6d7fd1fda880 100644 (file)
--- a/drivers/serial/v850e_uart.c
+++ b/drivers/serial/v850e_uart.c
@@ -271,14 +271,14 @@ void v850e_uart_tx (struct uart_port *port)
                v850e_uart_stop_tx (port, stopped);
 }
 
-static irqreturn_t v850e_uart_tx_irq(int irq, void *data, struct pt_regs *regs)
+static irqreturn_t v850e_uart_tx_irq(int irq, void *data)
 {
        struct uart_port *port = data;
        v850e_uart_tx (port);
        return IRQ_HANDLED;
 }
 
-static irqreturn_t v850e_uart_rx_irq(int irq, void *data, struct pt_regs *regs)
+static irqreturn_t v850e_uart_rx_irq(int irq, void *data)
 {
        struct uart_port *port = data;
        unsigned ch_stat = TTY_NORMAL;
@@ -300,8 +300,8 @@ static irqreturn_t v850e_uart_rx_irq(int irq, void *data, struct pt_regs *regs)
 
        port->icount.rx++;
 
-       tty_insert_flip_char (port->info->tty, ch, ch_stat);
-       tty_schedule_flip (port->info->tty);
+       tty_insert_flip_char (port->info->port.tty, ch, ch_stat);
+       tty_schedule_flip (port->info->port.tty);
 
        return IRQ_HANDLED;
 }
@@ -372,13 +372,13 @@ static int v850e_uart_startup (struct uart_port *port)
 
        /* Alloc RX irq.  */
        err = request_irq (V850E_UART_RX_IRQ (port->line), v850e_uart_rx_irq,
-                          SA_INTERRUPT, "v850e_uart", port);
+                          IRQF_DISABLED, "v850e_uart", port);
        if (err)
                return err;
 
        /* Alloc TX irq.  */
        err = request_irq (V850E_UART_TX_IRQ (port->line), v850e_uart_tx_irq,
-                          SA_INTERRUPT, "v850e_uart", port);
+                          IRQF_DISABLED, "v850e_uart", port);
        if (err) {
                free_irq (V850E_UART_RX_IRQ (port->line), port);
                return err;
@@ -404,8 +404,8 @@ static void v850e_uart_shutdown (struct uart_port *port)
 }
 
 static void
-v850e_uart_set_termios (struct uart_port *port, struct termios *termios,
-                       struct termios *old)
+v850e_uart_set_termios (struct uart_port *port, struct ktermios *termios,
+                       struct ktermios *old)
 {
        unsigned cflags = termios->c_cflag;
 
@@ -468,7 +468,6 @@ static struct uart_ops v850e_uart_ops = {
 static struct uart_driver v850e_uart_driver = {
        .owner                  = THIS_MODULE,
        .driver_name            = "v850e_uart",
-       .devfs_name             = "tts/",
        .dev_name               = "ttyS",
        .major                  = TTY_MAJOR,
        .minor                  = V850E_UART_MINOR_BASE,