diff options
author | Karsten Keil <kkeil@suse.de> | 2008-07-27 12:32:50 -0400 |
---|---|---|
committer | Karsten Keil <kkeil@suse.de> | 2008-07-27 12:32:50 -0400 |
commit | c5b61d59a685b1227b8a994b52a9b0bd68dc8da8 (patch) | |
tree | 11783d05be871b3d976c6a4db15cb7f78e519ff0 /drivers | |
parent | 8be1a6d6c77ab4532e4476fdb8177030ef48b52c (diff) |
Fix namespace issue with Hisax
you can pull this git://git./linux/kernel/git/kkeil/ISDN-2.6 master
rename release_tei() to TEIrelease() because release_tei() was
already exported bei the old HiSax driver.
Signed-off-by: Karsten Keil <kkeil@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/isdn/mISDN/layer2.c | 2 | ||||
-rw-r--r-- | drivers/isdn/mISDN/layer2.h | 2 | ||||
-rw-r--r-- | drivers/isdn/mISDN/tei.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/isdn/mISDN/layer2.c b/drivers/isdn/mISDN/layer2.c index f5ad888ee71e..a7915a156c04 100644 --- a/drivers/isdn/mISDN/layer2.c +++ b/drivers/isdn/mISDN/layer2.c | |||
@@ -2030,7 +2030,7 @@ release_l2(struct layer2 *l2) | |||
2030 | skb_queue_purge(&l2->down_queue); | 2030 | skb_queue_purge(&l2->down_queue); |
2031 | ReleaseWin(l2); | 2031 | ReleaseWin(l2); |
2032 | if (test_bit(FLG_LAPD, &l2->flag)) { | 2032 | if (test_bit(FLG_LAPD, &l2->flag)) { |
2033 | release_tei(l2); | 2033 | TEIrelease(l2); |
2034 | if (l2->ch.st) | 2034 | if (l2->ch.st) |
2035 | l2->ch.st->dev->D.ctrl(&l2->ch.st->dev->D, | 2035 | l2->ch.st->dev->D.ctrl(&l2->ch.st->dev->D, |
2036 | CLOSE_CHANNEL, NULL); | 2036 | CLOSE_CHANNEL, NULL); |
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 */ |
98 | extern int l2_tei(struct layer2 *, u_int, u_long arg); | 98 | extern int l2_tei(struct layer2 *, u_int, u_long arg); |
99 | extern void release_tei(struct layer2 *); | 99 | extern void TEIrelease(struct layer2 *); |
100 | extern int TEIInit(u_int *); | 100 | extern int TEIInit(u_int *); |
101 | extern void TEIFree(void); | 101 | extern void TEIFree(void); |
102 | 102 | ||
diff --git a/drivers/isdn/mISDN/tei.c b/drivers/isdn/mISDN/tei.c index 56a76a0ffddd..6fbae42127bf 100644 --- a/drivers/isdn/mISDN/tei.c +++ b/drivers/isdn/mISDN/tei.c | |||
@@ -945,7 +945,7 @@ l2_tei(struct layer2 *l2, u_int cmd, u_long arg) | |||
945 | } | 945 | } |
946 | 946 | ||
947 | void | 947 | void |
948 | release_tei(struct layer2 *l2) | 948 | TEIrelease(struct layer2 *l2) |
949 | { | 949 | { |
950 | struct teimgr *tm = l2->tm; | 950 | struct teimgr *tm = l2->tm; |
951 | u_long flags; | 951 | u_long flags; |