diff options
Diffstat (limited to 'drivers/serial/mpsc.c')
-rw-r--r-- | drivers/serial/mpsc.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/serial/mpsc.c b/drivers/serial/mpsc.c index 94681922ea0a..63d2a66e563b 100644 --- a/drivers/serial/mpsc.c +++ b/drivers/serial/mpsc.c | |||
@@ -50,7 +50,6 @@ | |||
50 | * 4) AFAICT, hardware flow control isn't supported by the controller --MAG. | 50 | * 4) AFAICT, hardware flow control isn't supported by the controller --MAG. |
51 | */ | 51 | */ |
52 | 52 | ||
53 | #include <linux/config.h> | ||
54 | 53 | ||
55 | #if defined(CONFIG_SERIAL_MPSC_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) | 54 | #if defined(CONFIG_SERIAL_MPSC_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) |
56 | #define SUPPORT_SYSRQ | 55 | #define SUPPORT_SYSRQ |
@@ -315,7 +314,6 @@ struct mpsc_port_info *mpsc_device_remove(int index); | |||
315 | #define MPSC_MAJOR 204 | 314 | #define MPSC_MAJOR 204 |
316 | #define MPSC_MINOR_START 44 | 315 | #define MPSC_MINOR_START 44 |
317 | #define MPSC_DRIVER_NAME "MPSC" | 316 | #define MPSC_DRIVER_NAME "MPSC" |
318 | #define MPSC_DEVFS_NAME "ttymm/" | ||
319 | #define MPSC_DEV_NAME "ttyMM" | 317 | #define MPSC_DEV_NAME "ttyMM" |
320 | #define MPSC_VERSION "1.00" | 318 | #define MPSC_VERSION "1.00" |
321 | 319 | ||
@@ -1414,7 +1412,7 @@ mpsc_startup(struct uart_port *port) | |||
1414 | 1412 | ||
1415 | /* If irq's are shared, need to set flag */ | 1413 | /* If irq's are shared, need to set flag */ |
1416 | if (mpsc_ports[0].port.irq == mpsc_ports[1].port.irq) | 1414 | if (mpsc_ports[0].port.irq == mpsc_ports[1].port.irq) |
1417 | flag = SA_SHIRQ; | 1415 | flag = IRQF_SHARED; |
1418 | 1416 | ||
1419 | if (request_irq(pi->port.irq, mpsc_sdma_intr, flag, | 1417 | if (request_irq(pi->port.irq, mpsc_sdma_intr, flag, |
1420 | "mpsc-sdma", pi)) | 1418 | "mpsc-sdma", pi)) |
@@ -1863,7 +1861,6 @@ static struct platform_driver mpsc_shared_driver = { | |||
1863 | static struct uart_driver mpsc_reg = { | 1861 | static struct uart_driver mpsc_reg = { |
1864 | .owner = THIS_MODULE, | 1862 | .owner = THIS_MODULE, |
1865 | .driver_name = MPSC_DRIVER_NAME, | 1863 | .driver_name = MPSC_DRIVER_NAME, |
1866 | .devfs_name = MPSC_DEVFS_NAME, | ||
1867 | .dev_name = MPSC_DEV_NAME, | 1864 | .dev_name = MPSC_DEV_NAME, |
1868 | .major = MPSC_MAJOR, | 1865 | .major = MPSC_MAJOR, |
1869 | .minor = MPSC_MINOR_START, | 1866 | .minor = MPSC_MINOR_START, |