Merge branch 'torvalds/master'

[firefly-linux-kernel-4.4.55.git] / arch / mn10300 / kernel / mn10300-serial.c

diff --git a/arch/mn10300/kernel/mn10300-serial.c b/arch/mn10300/kernel/mn10300-serial.c
index bf6e949a2f87a63f701f3a23a468574da4561cfe..7ecf69879e2d6ff077296a79605d8f367b70fdd4 100644 (file)
--- a/arch/mn10300/kernel/mn10300-serial.c
+++ b/arch/mn10300/kernel/mn10300-serial.c
@@ -985,17 +985,17 @@ static int mn10300_serial_startup(struct uart_port *_port)
        irq_set_chip(port->tm_irq, &mn10300_serial_pic);
 
        if (request_irq(port->rx_irq, mn10300_serial_interrupt,
-                       IRQF_DISABLED | IRQF_NOBALANCING,
+                       IRQF_NOBALANCING,
                        port->rx_name, port) < 0)
                goto error;
 
        if (request_irq(port->tx_irq, mn10300_serial_interrupt,
-                       IRQF_DISABLED | IRQF_NOBALANCING,
+                       IRQF_NOBALANCING,
                        port->tx_name, port) < 0)
                goto error2;
 
        if (request_irq(port->tm_irq, mn10300_serial_interrupt,
-                       IRQF_DISABLED | IRQF_NOBALANCING,
+                       IRQF_NOBALANCING,
                        port->tm_name, port) < 0)
                goto error3;
        mn10300_serial_mask_ack(port->tm_irq);