aboutsummaryrefslogtreecommitdiff
path: root/arch/um/kernel/irq_user.c
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2005-06-22 17:35:06 -0700
committerSteve French <sfrench@hera.kernel.org>2005-06-22 17:35:06 -0700
commit1bdf7a78c2b21fb94dfe7994dbe89310b18479d2 (patch)
tree7741cfd476f9c622a10c198da421fdb3e38708b9 /arch/um/kernel/irq_user.c
parentac67055ef2378ea95c34b593ddf9d0a0737a240a (diff)
parenta4936044001694f033fe4ea94d6034d51a6b465c (diff)
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/um/kernel/irq_user.c')
-rw-r--r--arch/um/kernel/irq_user.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/um/kernel/irq_user.c b/arch/um/kernel/irq_user.c
index b3074cbaa47..c3ccaf24f3e 100644
--- a/arch/um/kernel/irq_user.c
+++ b/arch/um/kernel/irq_user.c
@@ -85,8 +85,6 @@ void sigio_handler(int sig, union uml_pt_regs *regs)
next = irq_fd->next;
if(irq_fd->freed){
free_irq(irq_fd->irq, irq_fd->id);
- free_irq_by_irq_and_dev(irq_fd->irq,
- irq_fd->id);
}
}
}