git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge to Fedora kernel-2.6.18-1.2239_FC5 patched with stable patch-2.6.18.2-vs2.0...
[linux-2.6.git]
/
drivers
/
s390
/
char
/
tty3270.c
diff --git
a/drivers/s390/char/tty3270.c
b/drivers/s390/char/tty3270.c
index
2971804
..
06e2eee
100644
(file)
--- a/
drivers/s390/char/tty3270.c
+++ b/
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);