diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-06-22 21:26:47 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-06-22 21:26:47 -0400 |
| commit | ea0daab4ae4a2f853f06c76961c0ed324fd0804c (patch) | |
| tree | f6fbe2db5772695181b7a7257b05e43343bd8d75 /arch/um/drivers/xterm_kern.c | |
| parent | 58aab753de605c14b9878a897e7349c3063afeff (diff) | |
| parent | 1bdf7a78c2b21fb94dfe7994dbe89310b18479d2 (diff) | |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-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; |