---

yaml --- r: 213229 b: refs/heads/master c: 7bf4a5d h: refs/heads/master i: 213227: 187a953 v: v3
git-mirror · Oct 17, 2010 · 8b4c915 · 8b4c915
1 parent 52c7463
commit 8b4c915
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6370a6ad3b53df90b4700977f7718118a2cd524a
+refs/heads/master: 7bf4a5ddc9fbff52855cad8d4d74bf5344fe8093
diff --git a/trunk/drivers/isdn/hardware/eicon/divasmain.c b/trunk/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);