From f9af7458a33eaf2bc505d9f9e612ad520f75d229 Mon Sep 17 00:00:00 2001
From: Shawn Guo <shawn.guo@linaro.org>
Date: Thu, 14 Jun 2012 10:58:54 +0800
Subject: [PATCH] --- yaml --- r: 313511 b: refs/heads/master c:
 1ee8f65b5689504b98dacb6641fc8b2cc5618ad4 h: refs/heads/master i:   313509:
 be44053854b42715ef67110d0ace257743306596   313507:
 bc4d090f69ddb6348d2c11e889d86525d6dbcd93   313503:
 9f5d835ab530390f971f4f914686206b3318fb46 v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/tty/serial/imx.c | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 89c5e2c86f05..eff69f0efaf4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 69fcbc74bb7a8b3c86e15f27b74ee512633ffcc6
+refs/heads/master: 1ee8f65b5689504b98dacb6641fc8b2cc5618ad4
diff --git a/trunk/drivers/tty/serial/imx.c b/trunk/drivers/tty/serial/imx.c
index 4ef747307ecb..d5c689d6217e 100644
--- a/trunk/drivers/tty/serial/imx.c
+++ b/trunk/drivers/tty/serial/imx.c
@@ -169,7 +169,6 @@
 #define SERIAL_IMX_MAJOR        207
 #define MINOR_START	        16
 #define DEV_NAME		"ttymxc"
-#define MAX_INTERNAL_IRQ	MXC_INTERNAL_IRQS
 
 /*
  * This determines how often we check the modem status signals
@@ -741,10 +740,7 @@ static int imx_startup(struct uart_port *port)
 
 		/* do not use RTS IRQ on IrDA */
 		if (!USE_IRDA(sport)) {
-			retval = request_irq(sport->rtsirq, imx_rtsint,
-				     (sport->rtsirq < MAX_INTERNAL_IRQ) ? 0 :
-				       IRQF_TRIGGER_FALLING |
-				       IRQF_TRIGGER_RISING,
+			retval = request_irq(sport->rtsirq, imx_rtsint, 0,
 					DRIVER_NAME, sport);
 			if (retval)
 				goto error_out3;