git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
serial
/
v850e_uart.c
diff --git
a/drivers/serial/v850e_uart.c
b/drivers/serial/v850e_uart.c
index
bb48278
..
df705fd
100644
(file)
--- a/
drivers/serial/v850e_uart.c
+++ b/
drivers/serial/v850e_uart.c
@@
-240,7
+240,7
@@
console_initcall(v850e_uart_console_init);
\f
/* TX/RX interrupt handlers. */
\f
/* TX/RX interrupt handlers. */
-static void v850e_uart_stop_tx (struct uart_port *port
, unsigned tty_stop
);
+static void v850e_uart_stop_tx (struct uart_port *port);
void v850e_uart_tx (struct uart_port *port)
{
void v850e_uart_tx (struct uart_port *port)
{
@@
-339,14
+339,14
@@
static unsigned v850e_uart_get_mctrl (struct uart_port *port)
return mctrl;
}
return mctrl;
}
-static void v850e_uart_start_tx (struct uart_port *port
, unsigned tty_start
)
+static void v850e_uart_start_tx (struct uart_port *port)
{
v850e_intc_disable_irq (V850E_UART_TX_IRQ (port->line));
v850e_uart_tx (port);
v850e_intc_enable_irq (V850E_UART_TX_IRQ (port->line));
}
{
v850e_intc_disable_irq (V850E_UART_TX_IRQ (port->line));
v850e_uart_tx (port);
v850e_intc_enable_irq (V850E_UART_TX_IRQ (port->line));
}
-static void v850e_uart_stop_tx (struct uart_port *port
, unsigned tty_stop
)
+static void v850e_uart_stop_tx (struct uart_port *port)
{
v850e_intc_disable_irq (V850E_UART_TX_IRQ (port->line));
}
{
v850e_intc_disable_irq (V850E_UART_TX_IRQ (port->line));
}
@@
-496,7
+496,7
@@
static int __init v850e_uart_init (void)
port->ops = &v850e_uart_ops;
port->line = chan;
port->ops = &v850e_uart_ops;
port->line = chan;
- port->iotype =
SERIAL_
IO_MEM;
+ port->iotype =
UP
IO_MEM;
port->flags = UPF_BOOT_AUTOCONF;
/* We actually use multiple IRQs, but the serial
port->flags = UPF_BOOT_AUTOCONF;
/* We actually use multiple IRQs, but the serial