aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/isdn/mISDN/layer2.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-07-27 19:51:21 -0400
committerDavid S. Miller <davem@davemloft.net>2008-07-27 19:51:21 -0400
commit281c7413ed914623d3245299a4761b6b27ab9fdb (patch)
tree182b5222a7ad4b77c32f7845ea777ca665d7def2 /drivers/isdn/mISDN/layer2.h
parent2ab61b01110aa04cd853c619a74881e3225a5e24 (diff)
parentc9272c4f9fbe2087beb3392f526dc5b19efaa56b (diff)
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/isdn/mISDN/layer2.h')
-rw-r--r--drivers/isdn/mISDN/layer2.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/isdn/mISDN/layer2.h b/drivers/isdn/mISDN/layer2.h
index de2dd02056a3..6293f80dc2d3 100644
--- a/drivers/isdn/mISDN/layer2.h
+++ b/drivers/isdn/mISDN/layer2.h
@@ -96,7 +96,7 @@ extern int tei_l2(struct layer2 *, u_int, u_long arg);
96 96
97/* from tei.c */ 97/* from tei.c */
98extern int l2_tei(struct layer2 *, u_int, u_long arg); 98extern int l2_tei(struct layer2 *, u_int, u_long arg);
99extern void release_tei(struct layer2 *); 99extern void TEIrelease(struct layer2 *);
100extern int TEIInit(u_int *); 100extern int TEIInit(u_int *);
101extern void TEIFree(void); 101extern void TEIFree(void);
102 102