diff options
| author | Karsten Keil <kkeil@suse.de> | 2008-07-27 18:32:50 +0200 |
|---|---|---|
| committer | Karsten Keil <kkeil@suse.de> | 2008-07-27 18:32:50 +0200 |
| commit | c5b61d59a685b1227b8a994b52a9b0bd68dc8da8 (patch) | |
| tree | 11783d05be871b3d976c6a4db15cb7f78e519ff0 /drivers/isdn/mISDN | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rol... (diff) | |
| download | linux-c5b61d59a685b1227b8a994b52a9b0bd68dc8da8.tar.xz linux-c5b61d59a685b1227b8a994b52a9b0bd68dc8da8.zip | |
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/isdn/mISDN')
| -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) skb_queue_purge(&l2->down_queue); ReleaseWin(l2); if (test_bit(FLG_LAPD, &l2->flag)) { - release_tei(l2); + TEIrelease(l2); if (l2->ch.st) l2->ch.st->dev->D.ctrl(&l2->ch.st->dev->D, 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); /* 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); 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) } void -release_tei(struct layer2 *l2) +TEIrelease(struct layer2 *l2) { struct teimgr *tm = l2->tm; u_long flags; |