From 4a9458aef25ff36f95e64387f0ceda6a44ebab8c Mon Sep 17 00:00:00 2001
From: Jan Glauber <jan.glauber@de.ibm.com>
Date: Thu, 28 Sep 2006 16:55:53 +0200
Subject: [PATCH] --- yaml --- r: 36547 b: refs/heads/master c:
 51dced544e3964b684afc99282ceceaa384b16a8 h: refs/heads/master i:   36545:
 5fa01e623be3037b0103a50676d582a3357eec66   36543:
 4855b40c9640c2f658dd2e78f3a13a5aec2a78e4 v: v3

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

diff --git a/[refs] b/[refs]
index da9f702b67ac..fd3a789b9197 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0efa470363699ecba49e67cc3c75f46b300f98a4
+refs/heads/master: 51dced544e3964b684afc99282ceceaa384b16a8
diff --git a/trunk/drivers/s390/char/tty3270.c b/trunk/drivers/s390/char/tty3270.c
index 29718042c6c9..06e2eeec8473 100644
--- a/trunk/drivers/s390/char/tty3270.c
+++ b/trunk/drivers/s390/char/tty3270.c
@@ -698,7 +698,6 @@ tty3270_alloc_view(void)
 	if (!tp->freemem_pages)
 		goto out_tp;
 	INIT_LIST_HEAD(&tp->freemem);
-	init_timer(&tp->timer);
 	for (pages = 0; pages < TTY3270_STRING_PAGES; pages++) {
 		tp->freemem_pages[pages] = (void *)
 			__get_free_pages(GFP_KERNEL|GFP_DMA, 0);