The patch titled
pnx8xxx-uart: irq and ktermios fixes
has been removed from the -mm tree. Its filename was
pnx8550-uart-driver-fixes.patch
This patch was dropped because it was folded into pnx8550-uart-driver.patch
------------------------------------------------------
Subject: pnx8xxx-uart: irq and ktermios fixes
From: Vitaly Wool <vitalywool@xxxxxxxxx>
Add 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).
Signed-off-by: Vitaly Wool <vitalywool@xxxxxxxxx>
Cc: Russell King <rmk@xxxxxxxxxxxxxxxx>
Cc: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx>
Cc: Ralf Baechle <ralf@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/serial/pnx8xxx_uart.c | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff -puN drivers/serial/pnx8xxx_uart.c~pnx8550-uart-driver-fixes drivers/serial/pnx8xxx_uart.c
--- a/drivers/serial/pnx8xxx_uart.c~pnx8550-uart-driver-fixes
+++ a/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,
@@ -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,
_
Patches currently in -mm which might be from vitalywool@xxxxxxxxx are
fix-pnx8550-serial-breakage.patch
pnx8550-uart-driver.patch
pnx8550-uart-driver-fixes.patch
8250-make-probing-for-txen-bug-a-config-option.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
