---

yaml --- r: 97551 b: refs/heads/master c: a4ed1e4 h: refs/heads/master i: 97549: 8ef907e 97547: 88da0e1 97543: d093ee3 97535: bf8f3dd v: v3
git-mirror · May 31, 2008 · 9829594 · 9829594
1 parent 4dfb2c3
commit 9829594
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a70ce072b3883e431575449f3e294c27235590e5
+refs/heads/master: a4ed1e41a734d77c9a83a88a8736e19b68e6a2a0
diff --git a/trunk/drivers/serial/8250.c b/trunk/drivers/serial/8250.c
@@ -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)

diff --git a/trunk/drivers/serial/8250.h b/trunk/drivers/serial/8250.h
@@ -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
-