diff options
Diffstat (limited to 'drivers/serial/m32r_sio.c')
-rw-r--r-- | drivers/serial/m32r_sio.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/serial/m32r_sio.c b/drivers/serial/m32r_sio.c index 321a40f33b50..e7fe4bb46eca 100644 --- a/drivers/serial/m32r_sio.c +++ b/drivers/serial/m32r_sio.c | |||
@@ -25,7 +25,6 @@ | |||
25 | * membase is an 'ioremapped' cookie. This is compatible with the old | 25 | * membase is an 'ioremapped' cookie. This is compatible with the old |
26 | * serial.c driver, and is currently the preferred form. | 26 | * serial.c driver, and is currently the preferred form. |
27 | */ | 27 | */ |
28 | #include <linux/config.h> | ||
29 | 28 | ||
30 | #if defined(CONFIG_SERIAL_M32R_SIO_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) | 29 | #if defined(CONFIG_SERIAL_M32R_SIO_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) |
31 | #define SUPPORT_SYSRQ | 30 | #define SUPPORT_SYSRQ |
@@ -543,7 +542,7 @@ static void serial_do_unlink(struct irq_info *i, struct uart_sio_port *up) | |||
543 | static int serial_link_irq_chain(struct uart_sio_port *up) | 542 | static int serial_link_irq_chain(struct uart_sio_port *up) |
544 | { | 543 | { |
545 | struct irq_info *i = irq_lists + up->port.irq; | 544 | struct irq_info *i = irq_lists + up->port.irq; |
546 | int ret, irq_flags = up->port.flags & UPF_SHARE_IRQ ? SA_SHIRQ : 0; | 545 | int ret, irq_flags = up->port.flags & UPF_SHARE_IRQ ? IRQF_SHARED : 0; |
547 | 546 | ||
548 | spin_lock_irq(&i->lock); | 547 | spin_lock_irq(&i->lock); |
549 | 548 | ||
@@ -1131,7 +1130,6 @@ console_initcall(m32r_sio_console_init); | |||
1131 | static struct uart_driver m32r_sio_reg = { | 1130 | static struct uart_driver m32r_sio_reg = { |
1132 | .owner = THIS_MODULE, | 1131 | .owner = THIS_MODULE, |
1133 | .driver_name = "sio", | 1132 | .driver_name = "sio", |
1134 | .devfs_name = "tts/", | ||
1135 | .dev_name = "ttyS", | 1133 | .dev_name = "ttyS", |
1136 | .major = TTY_MAJOR, | 1134 | .major = TTY_MAJOR, |
1137 | .minor = 64, | 1135 | .minor = 64, |