diff options
author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /drivers/isdn/mISDN/tei.c | |
parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'drivers/isdn/mISDN/tei.c')
-rw-r--r-- | drivers/isdn/mISDN/tei.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/isdn/mISDN/tei.c b/drivers/isdn/mISDN/tei.c index e04bad6c5baf..6d4da6095885 100644 --- a/drivers/isdn/mISDN/tei.c +++ b/drivers/isdn/mISDN/tei.c | |||
@@ -725,7 +725,7 @@ tei_id_ver_tout_net(struct FsmInst *fi, int event, void *arg) | |||
725 | if (tm->rcnt == 1) { | 725 | if (tm->rcnt == 1) { |
726 | if (*debug & DEBUG_L2_TEI) | 726 | if (*debug & DEBUG_L2_TEI) |
727 | tm->tei_m.printdebug(fi, | 727 | tm->tei_m.printdebug(fi, |
728 | "check req for tei %d sucessful\n", tm->l2->tei); | 728 | "check req for tei %d successful\n", tm->l2->tei); |
729 | mISDN_FsmChangeState(fi, ST_TEI_NOP); | 729 | mISDN_FsmChangeState(fi, ST_TEI_NOP); |
730 | } else if (tm->rcnt > 1) { | 730 | } else if (tm->rcnt > 1) { |
731 | /* duplicate assignment; remove */ | 731 | /* duplicate assignment; remove */ |