projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
[powerpc.git]
/
drivers
/
serial
/
v850e_uart.c
diff --git
a/drivers/serial/v850e_uart.c
b/drivers/serial/v850e_uart.c
index
9378895
..
f802867
100644
(file)
--- a/
drivers/serial/v850e_uart.c
+++ b/
drivers/serial/v850e_uart.c
@@
-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,
/* 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,
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;
if (err) {
free_irq (V850E_UART_RX_IRQ (port->line), port);
return err;
@@
-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",
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,
.dev_name = "ttyS",
.major = TTY_MAJOR,
.minor = V850E_UART_MINOR_BASE,
@@
-496,7
+495,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