Merge commit 'origin/master' into next

[pandora-kernel.git] / drivers / isdn / mISDN / layer2.h

diff --git a/drivers/isdn/mISDN/layer2.h b/drivers/isdn/mISDN/layer2.h
index de2dd02..9547fb3 100644 (file)
--- a/drivers/isdn/mISDN/layer2.h
+++ b/drivers/isdn/mISDN/layer2.h
@@ -90,13 +90,13 @@ enum {
 #define L2_STATE_COUNT (ST_L2_8+1)
 
 extern struct layer2   *create_l2(struct mISDNchannel *, u_int,
-                               u_long, u_long);
+                               u_long, int, int);
 extern int             tei_l2(struct layer2 *, u_int, u_long arg);
 
 
 /* from tei.c */
 extern int             l2_tei(struct layer2 *, u_int, u_long arg);
-extern void            release_tei(struct layer2 *);
+extern void            TEIrelease(struct layer2 *);
 extern int             TEIInit(u_int *);
 extern void            TEIFree(void);