diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-02 08:39:09 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-02 08:39:09 -0400 |
| commit | d2f6409584e2c62ffad81690562330ff3bf4a458 (patch) | |
| tree | 3bdfb97d0b51be2f7f414f2107e97603c1206abb /arch/um/drivers/xterm_kern.c | |
| parent | e1b09eba2686eca94a3a188042b518df6044a3c1 (diff) | |
| parent | 4a89a04f1ee21a7c1f4413f1ad7dcfac50ff9b63 (diff) | |
Merge with master.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; |