diff options
| author | Jaroslav Kysela <perex@petra> | 2005-06-22 06:19:24 -0400 |
|---|---|---|
| committer | Jaroslav Kysela <perex@petra> | 2005-06-22 06:19:24 -0400 |
| commit | da04b128cf0d74dd4cab270c53d9264e70f9203e (patch) | |
| tree | 095355c32dfd709236a85b497d3bd461d7cdfe8a /arch/um/drivers/xterm_kern.c | |
| parent | fae6ec69c84d71b1d5bda9ede1a262c1681684aa (diff) | |
| parent | 2a5a68b840cbab31baab2d9b2e1e6de3b289ae1e (diff) | |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/um/drivers/xterm_kern.c')
| -rw-r--r-- | arch/um/drivers/xterm_kern.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/um/drivers/xterm_kern.c b/arch/um/drivers/xterm_kern.c index a4fdf3584ad2..d269a80f4b0c 100644 --- 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) | |||
| 69 | * isn't set) this will hang... */ | 69 | * isn't set) this will hang... */ |
| 70 | wait_for_completion(&data->ready); | 70 | wait_for_completion(&data->ready); |
| 71 | 71 | ||
| 72 | free_irq_by_irq_and_dev(XTERM_IRQ, data); | ||
| 73 | free_irq(XTERM_IRQ, data); | 72 | free_irq(XTERM_IRQ, data); |
| 74 | 73 | ||
| 75 | ret = data->new_fd; | 74 | ret = data->new_fd; |