Merge branch 'irq-threaded-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / include / linux / mISDNhw.h

diff --git a/include/linux/mISDNhw.h b/include/linux/mISDNhw.h
index 97ffdc1..7f9831d 100644 (file)
--- a/include/linux/mISDNhw.h
+++ b/include/linux/mISDNhw.h
@@ -89,11 +89,6 @@ struct dchannel {
        void                    (*phfunc) (struct dchannel *);
        u_int                   state;
        void                    *l1;
-       /* HW access */
-       u_char                  (*read_reg) (void *, u_char);
-       void                    (*write_reg) (void *, u_char, u_char);
-       void                    (*read_fifo) (void *, u_char *, int);
-       void                    (*write_fifo) (void *, u_char *, int);
        void                    *hw;
        int                     slot;   /* multiport card channel slot */
        struct timer_list       timer;
@@ -151,11 +146,6 @@ struct bchannel {
        u_long                  Flags;
        struct work_struct      workq;
        u_int                   state;
-       /* HW access */
-       u_char                  (*read_reg) (void *, u_char);
-       void                    (*write_reg) (void *, u_char, u_char);
-       void                    (*read_fifo) (void *, u_char *, int);
-       void                    (*write_fifo) (void *, u_char *, int);
        void                    *hw;
        int                     slot;   /* multiport card channel slot */
        struct timer_list       timer;
@@ -185,7 +175,7 @@ extern int  dchannel_senddata(struct dchannel *, struct sk_buff *);
 extern int     bchannel_senddata(struct bchannel *, struct sk_buff *);
 extern void    recv_Dchannel(struct dchannel *);
 extern void    recv_Echannel(struct dchannel *, struct dchannel *);
-extern void    recv_Bchannel(struct bchannel *);
+extern void    recv_Bchannel(struct bchannel *, unsigned int id);
 extern void    recv_Dchannel_skb(struct dchannel *, struct sk_buff *);
 extern void    recv_Bchannel_skb(struct bchannel *, struct sk_buff *);
 extern void    confirm_Bsend(struct bchannel *bch);