Fix namespace issue with Hisax
PATCH 1/1 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 <[email protected]>
--- drivers/isdn/mISDN/layer2.c | 2 +- drivers/isdn/mISDN/layer2.h | 2 +- drivers/isdn/mISDN/tei.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
drivers/isdn/mISDN/layer2.c +1 -1
@@ -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 );
drivers/isdn/mISDN/layer2.h +1 -1
@@ -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 );
drivers/isdn/mISDN/tei.c +1 -1
@@ -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;
Signature · 8 lines
1.5.6.4 -- Karsten Keil SuSE Labs ISDN and VOIP development SUSE LINUX Products GmbH, Maxfeldstr.5 90409 Nuernberg, GF: Markus Rex, HRB 16746 (AG Nuernberg)