From c1ca41a3b06ddbc4ad9cf6ffa2bfce303ece949e Mon Sep 17 00:00:00 2001
From: Javier Herrero <jherrero@hvsistemas.es>
Date: Sat, 17 May 2008 18:21:42 +0800
Subject: [PATCH] --- yaml --- r: 96979 b: refs/heads/master c:
 b4aa54d951d38d7a989d6b6385494ef5ea7371d7 h: refs/heads/master i:   96977:
 ebe8da3051985f814c14e5d0c824d52198ce951d   96975:
 c22524a367fc6b62c519bc1eff6a35b874255b25 v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/serial/8250.c | 5 +++--
 trunk/drivers/serial/8250.h | 5 +++++
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 5101c79518e2..484380885928 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e291434eb128d7b4217dde6e0543f4342dd51fa
+refs/heads/master: b4aa54d951d38d7a989d6b6385494ef5ea7371d7
diff --git a/trunk/drivers/serial/8250.c b/trunk/drivers/serial/8250.c
index a1ca9b7bf2d5..1400ea6a2491 100644
--- a/trunk/drivers/serial/8250.c
+++ b/trunk/drivers/serial/8250.c
@@ -43,6 +43,7 @@
 
 #include <asm/io.h>
 #include <asm/irq.h>
+#include <asm/serial.h>
 
 #include "8250.h"
 
@@ -92,8 +93,6 @@ 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
@@ -1548,6 +1547,8 @@ 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
index 91bd28f2bb47..a10a40cc0d9e 100644
--- a/trunk/drivers/serial/8250.h
+++ b/trunk/drivers/serial/8250.h
@@ -78,3 +78,8 @@ struct serial8250_config {
 #else
 #define ALPHA_KLUDGE_MCR 0
 #endif
+
+#ifndef SERIAL_EXTRA_IRQ_FLAGS
+#define SERIAL_EXTRA_IRQ_FLAGS 0
+#endif
+