From 992287f304368ca282a9fd794e9ef377b0a2911d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Breno=20Leit=C3=A3o?= <leitao@linux.vnet.ibm.com>
Date: Tue, 29 Sep 2009 15:16:55 -0300
Subject: [PATCH] --- yaml --- r: 175310 b: refs/heads/master c:
 a53568a22adf6881183096d0863b0ff301173cbd h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/serial/jsm/jsm.h     | 1 -
 trunk/drivers/serial/jsm/jsm_neo.c | 4 ----
 3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 6fd61f0a4045..8559a36d4132 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 354aaf964ed1ae45c175aa496526bae4662c4452
+refs/heads/master: a53568a22adf6881183096d0863b0ff301173cbd
diff --git a/trunk/drivers/serial/jsm/jsm.h b/trunk/drivers/serial/jsm/jsm.h
index 4e5f3bde0461..afcbee24a6b2 100644
--- a/trunk/drivers/serial/jsm/jsm.h
+++ b/trunk/drivers/serial/jsm/jsm.h
@@ -216,7 +216,6 @@ struct jsm_channel {
 	u8		ch_startc;	/* Start character		*/
 
 	u32		ch_old_baud;	/* Cache of the current baud */
-	u32		ch_custom_speed;/* Custom baud, if set */
 
 	u32		ch_wopen;	/* Waiting for open process cnt */
 
diff --git a/trunk/drivers/serial/jsm/jsm_neo.c b/trunk/drivers/serial/jsm/jsm_neo.c
index b4b124e4828f..088e702ef5f3 100644
--- a/trunk/drivers/serial/jsm/jsm_neo.c
+++ b/trunk/drivers/serial/jsm/jsm_neo.c
@@ -957,10 +957,6 @@ static void neo_param(struct jsm_channel *ch)
 		ch->ch_old_baud = 0;
 		return;
 
-	} else if (ch->ch_custom_speed) {
-			baud = ch->ch_custom_speed;
-			if (ch->ch_flags & CH_BAUD0)
-				ch->ch_flags &= ~(CH_BAUD0);
 	} else {
 		int i;
 		unsigned int cflag;