projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-jeff' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6
[powerpc.git]
/
arch
/
um
/
drivers
/
xterm_kern.c
diff --git
a/arch/um/drivers/xterm_kern.c
b/arch/um/drivers/xterm_kern.c
index
a4fdf35
..
d269a80
100644
(file)
--- a/
arch/um/drivers/xterm_kern.c
+++ b/
arch/um/drivers/xterm_kern.c
@@
-69,7
+69,6
@@
int xterm_fd(int socket, int *pid_out)
* isn't set) this will hang... */
wait_for_completion(&data->ready);
- free_irq_by_irq_and_dev(XTERM_IRQ, data);
free_irq(XTERM_IRQ, data);
ret = data->new_fd;