Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6] / arch / um / kernel / irq_user.c

diff --git a/arch/um/kernel/irq_user.c b/arch/um/kernel/irq_user.c
index b3074cbaa479ac3de6c42242006d8e5c1f33cb42..c3ccaf24f3e0722cc4e3cc1a9ab8458fd8f41fdf 100644 (file)
--- 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);
                                }
                        }
                }