ISDN: Merge Ingo's work_struct and my tasklet changes

diff --cc Makefile
Simple merge

diff --cc drivers/isdn/i4l/isdn_net.c
index a64b0e3d8b6f6ddf776f5196b509d90b4001a8f6,72a67a6643336377ac18db7fe8b3971167136a59..43da8a9e46e8886b7afcf51ac73303af3a0d7d7d
--- 1/drivers/isdn/i4l/isdn_net.c
--- 2/drivers/isdn/i4l/isdn_net.c
+++ b/drivers/isdn/i4l/isdn_net.c
@@@ -850,8 -219,8 +219,9 @@@ isdn_net_write_super(isdn_net_dev *idev
        if (in_irq()) {
                // we can't grab the lock from irq context, 
                // so we just queue the packet
-               skb_queue_tail(&lp->super_tx_queue, skb); 
-               schedule_work(&lp->tqueue);
+               skb_queue_tail(&idev->super_tx_queue, skb); 
++
+               tasklet_schedule(&idev->tlet);
                return;
        }
  

diff --cc include/linux/isdn.h
index 7de3324606ee5c36a4a8231e7ba8d46add4dcb20,5ae4ef0d7ddc6409c83294b1208868c87db0fcd2..d8c7b6e2eea39b6e7324fb3dd6a223243b21df76
--- 1/include/linux/isdn.h
--- 2/include/linux/isdn.h
+++ b/include/linux/isdn.h
@@@ -361,9 -355,11 +355,12 @@@ typedef struct isdn_net_local_s 
    ulong cisco_last_slarp_in;          /* jiffie of last keepalive packet we received */
    char cisco_line_state;              /* state of line according to keepalive packets */
    char cisco_debserint;                       /* debugging flag of cisco hdlc with slarp */
-   struct timer_list cisco_timer;
-   struct work_struct tqueue;
-   struct isdn_netif_ops   *ops;
++
+   struct timer_list       cisco_timer;
+ 
+   struct isdn_netif_ops  *ops;
+ 
+   struct net_device       dev;          /* interface to upper levels        */
  } isdn_net_local;
  
  /* the interface itself */