Commit 341fb4b6 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds

[PATCH] fix all the isdn compile mess

This doesnt fix all the isdn code but it sorts out the tqueue stuff so we
are no worse than before
parent 6164ed90
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
#undef N_DATA #undef N_DATA
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/tqueue.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/ioport.h> #include <linux/ioport.h>
......
...@@ -1173,7 +1173,6 @@ static int __devinit checkcard(int cardnr, char *id, int *busy_flag) ...@@ -1173,7 +1173,6 @@ static int __devinit checkcard(int cardnr, char *id, int *busy_flag)
cs->tx_skb = NULL; cs->tx_skb = NULL;
cs->tx_cnt = 0; cs->tx_cnt = 0;
cs->event = 0; cs->event = 0;
cs->tqueue.sync = 0;
cs->tqueue.data = cs; cs->tqueue.data = cs;
skb_queue_head_init(&cs->rq); skb_queue_head_init(&cs->rq);
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/config.h> #include <linux/config.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/workqueue.h>
#include "hisax_if.h" #include "hisax_if.h"
#include "hisax.h" #include "hisax.h"
#include "isdnl1.h" #include "isdnl1.h"
...@@ -509,7 +510,7 @@ dch_init(struct IsdnCardState *cs) ...@@ -509,7 +510,7 @@ dch_init(struct IsdnCardState *cs)
{ {
printk(KERN_INFO "HiSax: IPACX ISDN driver v0.1.0\n"); printk(KERN_INFO "HiSax: IPACX ISDN driver v0.1.0\n");
INIT_WORK(&cs->tqueue, (void *)(void *) dch_bh); INIT_WORK(&cs->tqueue, (void *)(void *) dch_bh, cs);
cs->setstack_d = dch_setstack; cs->setstack_d = dch_setstack;
cs->dbusytimer.function = (void *) dbusy_timer_handler; cs->dbusytimer.function = (void *) dbusy_timer_handler;
......
...@@ -19,7 +19,9 @@ ...@@ -19,7 +19,9 @@
#include "isdn_net.h" #include "isdn_net.h"
#include <linux/concap.h> #include <linux/concap.h>
#include "isdn_concap.h" #include "isdn_concap.h"
#include <linux/if_arp.h>
#ifdef CONFIG_ISDN_X25
/* The following set of device service operations are for encapsulation /* The following set of device service operations are for encapsulation
protocols that require for reliable datalink semantics. That means: protocols that require for reliable datalink semantics. That means:
......
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/tqueue.h>
#include <linux/skbuff.h> #include <linux/skbuff.h>
#include <asm/io.h> #include <asm/io.h>
......
...@@ -35,7 +35,6 @@ ...@@ -35,7 +35,6 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/tqueue.h>
#include <linux/skbuff.h> #include <linux/skbuff.h>
#include <asm/io.h> #include <asm/io.h>
......
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/tqueue.h>
#include <linux/skbuff.h> #include <linux/skbuff.h>
#include <linux/timer.h> #include <linux/timer.h>
......
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/tqueue.h>
#include <linux/skbuff.h> #include <linux/skbuff.h>
#include <linux/isdnif.h> #include <linux/isdnif.h>
......
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/tqueue.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <asm/io.h> #include <asm/io.h>
......
...@@ -14,8 +14,7 @@ ...@@ -14,8 +14,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/tqueue.h>
#include <linux/interrupt.h>
#include <linux/init.h> #include <linux/init.h>
#include <asm/io.h> #include <asm/io.h>
......
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/tqueue.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <asm/io.h> #include <asm/io.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment