diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-27 09:58:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-27 09:58:59 -0700 |
| commit | f631a78445e94b8a9ae23980d00a5cb2d9c3d0c7 (patch) | |
| tree | 0c878afd0267ee917fe289fb4b4a5cef3b95b89f /drivers | |
| parent | 13ffc32eaf0b75a19bd8c3a8702faedde28853fe (diff) | |
| parent | c5b61d59a685b1227b8a994b52a9b0bd68dc8da8 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/ISDN-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/ISDN-2.6:
Fix namespace issue with Hisax
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 f5ad888ee71..a7915a156c0 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 de2dd02056a..6293f80dc2d 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 56a76a0ffdd..6fbae42127b 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; |