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>

diff --git a/drivers/isdn/mISDN/layer2.c b/drivers/isdn/mISDN/layer2.c
index f5ad888ee71eb06854d0058c23fde221c2ebd984..a7915a156c0419eff3cbafede3b69d649549e934 100644 (file)
--- 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 de2dd02056a36c607f9568e5c7b332038795ee0b..6293f80dc2d3762bfcb5579490a542271bf8890f 100644 (file)
--- 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 56a76a0ffddd5715ad25d2cf22e5bd4581da8b80..6fbae42127bfd8ebcc268db5dc029781d7618ad8 100644 (file)
--- 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;