Merge branch 'master' into tk71

[mv-sheeva.git] / drivers / isdn / hardware / eicon / divasmain.c

diff --git a/drivers/isdn/hardware/eicon/divasmain.c b/drivers/isdn/hardware/eicon/divasmain.c
index ed9c555067975cec3d6d443c06249fd027e791d5..f332b60eff6b32654addd49cde725cec84f80c0a 100644 (file)
--- a/drivers/isdn/hardware/eicon/divasmain.c
+++ b/drivers/isdn/hardware/eicon/divasmain.c
@@ -15,7 +15,6 @@
 #include <asm/uaccess.h>
 #include <asm/io.h>
 #include <linux/ioport.h>
-#include <linux/workqueue.h>
 #include <linux/pci.h>
 #include <linux/interrupt.h>
 #include <linux/list.h>
@@ -546,7 +545,6 @@ void diva_os_remove_soft_isr(diva_os_soft_isr_t * psoft_isr)
                void *mem;
 
                tasklet_kill(&pdpc->divas_task);
-               flush_scheduled_work();
                mem = psoft_isr->object;
                psoft_isr->object = NULL;
                diva_os_free(0, mem);