From 089a1557e65e0d68575177da33bc5f19433fe362 Mon Sep 17 00:00:00 2001
From: Uli Luckas <u.luckas@road-gmbh.de>
Date: Thu, 22 Jun 2006 16:49:54 +0100
Subject: [PATCH] --- yaml --- r: 28871 b: refs/heads/master c:
 005b5e4d0c7795d2ec298c34c96cbe2c1e1902b0 h: refs/heads/master i:   28869:
 dddcc1cda5a9fb3333d7635ed548952b217abbea   28867:
 f22935bdb60cf34f1c5e569439fe008ebaaa86d3   28863:
 84aea9fdf9318b336a370c53624a9abb1a12ce46 v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/serial/pxa.c | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0ba566b267c4..2452ac42e134 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b76a68c6caafef5a91cdc80958aecaca76a8896
+refs/heads/master: 005b5e4d0c7795d2ec298c34c96cbe2c1e1902b0
diff --git a/trunk/drivers/serial/pxa.c b/trunk/drivers/serial/pxa.c
index 77d4568ccc3a..ae3649568541 100644
--- a/trunk/drivers/serial/pxa.c
+++ b/trunk/drivers/serial/pxa.c
@@ -269,7 +269,6 @@ static unsigned int serial_pxa_get_mctrl(struct uart_port *port)
 	unsigned char status;
 	unsigned int ret;
 
-return TIOCM_CTS | TIOCM_DSR | TIOCM_CAR;
 	status = serial_in(up, UART_MSR);
 
 	ret = 0;