tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds f631a784 13ffc32e

+3 -3
unified split
+1 -1
drivers/isdn/mISDN/layer2.c
··· 2030 skb_queue_purge(&l2->down_queue); 2031 ReleaseWin(l2); 2032 if (test_bit(FLG_LAPD, &l2->flag)) { 2033 - release_tei(l2); 2034 if (l2->ch.st) 2035 l2->ch.st->dev->D.ctrl(&l2->ch.st->dev->D, 2036 CLOSE_CHANNEL, NULL);
··· 2030 skb_queue_purge(&l2->down_queue); 2031 ReleaseWin(l2); 2032 if (test_bit(FLG_LAPD, &l2->flag)) { 2033 + TEIrelease(l2); 2034 if (l2->ch.st) 2035 l2->ch.st->dev->D.ctrl(&l2->ch.st->dev->D, 2036 CLOSE_CHANNEL, NULL);
+1 -1
drivers/isdn/mISDN/layer2.h
··· 96 97 /* from tei.c */ 98 extern int l2_tei(struct layer2 *, u_int, u_long arg); 99 - extern void release_tei(struct layer2 *); 100 extern int TEIInit(u_int *); 101 extern void TEIFree(void); 102
··· 96 97 /* from tei.c */ 98 extern int l2_tei(struct layer2 *, u_int, u_long arg); 99 + extern void TEIrelease(struct layer2 *); 100 extern int TEIInit(u_int *); 101 extern void TEIFree(void); 102
+1 -1
drivers/isdn/mISDN/tei.c
··· 945 } 946 947 void 948 - release_tei(struct layer2 *l2) 949 { 950 struct teimgr *tm = l2->tm; 951 u_long flags;
··· 945 } 946 947 void 948 + TEIrelease(struct layer2 *l2) 949 { 950 struct teimgr *tm = l2->tm; 951 u_long flags;