8250 Serial Driver: revert extra IRQ flag definition patch
authorBryan Wu <cooloney@kernel.org>
Sat, 31 May 2008 08:10:04 +0000 (16:10 +0800)
committerBryan Wu <cooloney@kernel.org>
Sat, 31 May 2008 08:10:04 +0000 (16:10 +0800)
As Russell pointed out, original patch will break some serial configurations
because of the dependency of the <asm/serial.h> header file.

Revert it first and try to find out other solution later

Cc: Javier Herrero <jherrero@hvsistemas.es>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Russell King <rmk+lkml@arm.linux.org.uk>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
drivers/serial/8250.c
drivers/serial/8250.h

index 1400ea6a249192e9a322a5c006595b6ee250e783..1bc00b721e9dac70693f20b85c4f72776f214eb2 100644 (file)
@@ -43,7 +43,6 @@
 
 #include <asm/io.h>
 #include <asm/irq.h>
-#include <asm/serial.h>
 
 #include "8250.h"
 
@@ -93,6 +92,7 @@ static unsigned int nr_uarts = CONFIG_SERIAL_8250_RUNTIME_UARTS;
  */
 #define CONFIG_HUB6 1
 
+#include <asm/serial.h>
 /*
  * SERIAL_PORT_DFNS tells us about built-in ports that have no
  * standard enumeration mechanism.   Platforms that can find all
@@ -1547,8 +1547,6 @@ static int serial_link_irq_chain(struct uart_8250_port *up)
                i->head = &up->list;
                spin_unlock_irq(&i->lock);
 
-               irq_flags |= SERIAL_EXTRA_IRQ_FLAGS;
-
                ret = request_irq(up->port.irq, serial8250_interrupt,
                                  irq_flags, "serial", i);
                if (ret < 0)
index a10a40cc0d9e607cd972746284af7e32cc885976..91bd28f2bb473c637c8f19b719b9d5d8a84875a3 100644 (file)
@@ -78,8 +78,3 @@ struct serial8250_config {
 #else
 #define ALPHA_KLUDGE_MCR 0
 #endif
-
-#ifndef SERIAL_EXTRA_IRQ_FLAGS
-#define SERIAL_EXTRA_IRQ_FLAGS 0
-#endif
-