Hello Andrew,
this patch adds irq 2.6.19 changes and 2.6.20 ktermios changes to
pnx8xxx-uart.c (which was added to -mm tree with pnx8550-uart-driver.patch).
drivers/serial/pnx8xxx_uart.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
Signed-off-by: Vitaly Wool <[EMAIL PROTECTED]>
Index: linux-2.6/drivers/serial/pnx8xxx_uart.c
===================================================================
--- linux-2.6.orig/drivers/serial/pnx8xxx_uart.c
+++ linux-2.6/drivers/serial/pnx8xxx_uart.c
@@ -179,8 +179,7 @@ static void pnx8xxx_enable_ms(struct uar
mod_timer(&sport->timer, jiffies);
}
-static void
-pnx8xxx_rx_chars(struct pnx8xxx_port *sport, struct pt_regs *regs)
+static void pnx8xxx_rx_chars(struct pnx8xxx_port *sport)
{
struct tty_struct *tty = sport->port.info->tty;
unsigned int status, ch, flg;
@@ -220,7 +219,7 @@ pnx8xxx_rx_chars(struct pnx8xxx_port *sp
#endif
}
- if (uart_handle_sysrq_char(&sport->port, ch, regs))
+ if (uart_handle_sysrq_char(&sport->port, ch))
goto ignore_char;
uart_insert_char(&sport->port, status,
@@ -276,7 +275,7 @@ static void pnx8xxx_tx_chars(struct pnx8
pnx8xxx_stop_tx(&sport->port);
}
-static irqreturn_t pnx8xxx_int(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t pnx8xxx_int(int irq, void *dev_id)
{
struct pnx8xxx_port *sport = dev_id;
unsigned int status;
@@ -293,7 +292,7 @@ static irqreturn_t pnx8xxx_int(int irq,
/* Byte received */
if (status & PNX8XXX_UART_INT_RX)
- pnx8xxx_rx_chars(sport, regs);
+ pnx8xxx_rx_chars(sport);
/* TX holding register empty - transmit a byte */
if (status & PNX8XXX_UART_INT_TX)
@@ -429,8 +428,8 @@ static void pnx8xxx_shutdown(struct uart
}
static void
-pnx8xxx_set_termios(struct uart_port *port, struct termios *termios,
- struct termios *old)
+pnx8xxx_set_termios(struct uart_port *port, struct ktermios *termios,
+ struct ktermios *old)
{
struct pnx8xxx_port *sport = (struct pnx8xxx_port *)port;
unsigned long flags;
@@ -727,7 +726,7 @@ pnx8xxx_console_setup(struct console *co
return uart_set_options(&sport->port, co, baud, parity, bits, flow);
}
-extern struct uart_driver pnx8xxx_reg;
+static struct uart_driver pnx8xxx_reg;
static struct console pnx8xxx_console = {
.name = "ttyS",
.write = pnx8xxx_console_write,
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
