diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-09-12 01:29:55 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-09-12 01:29:55 +0000 |
| commit | 545f435ebcfd94a1e7c20b46efe81b4d6ac4e698 (patch) | |
| tree | e9ce4bc598d06374bda906f18365984bf22a526a /drivers/isdn/hisax/l3dss1.c | |
| parent | 4291a610eef89d0d5c69d9a10ee6560e1aa36c74 (diff) | |
Merge with Linux 2.1.55. More bugfixes and goodies from my private
CVS archive.
Diffstat (limited to 'drivers/isdn/hisax/l3dss1.c')
| -rw-r--r-- | drivers/isdn/hisax/l3dss1.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/isdn/hisax/l3dss1.c b/drivers/isdn/hisax/l3dss1.c index 60493560f..ea1f7490e 100644 --- a/drivers/isdn/hisax/l3dss1.c +++ b/drivers/isdn/hisax/l3dss1.c @@ -1,4 +1,4 @@ -/* $Id: l3dss1.c,v 1.15 1997/04/17 11:50:48 keil Exp $ +/* $Id: l3dss1.c,v 1.2 1997/06/03 09:24:34 ralf Exp $ * EURO/DSS1 D-channel protocol * @@ -9,6 +9,9 @@ * Fritz Elfert * * $Log: l3dss1.c,v $ + * Revision 1.2 1997/06/03 09:24:34 ralf + * Sync with Linux 2.1.42. + * * Revision 1.15 1997/04/17 11:50:48 keil * pa->loc was undefined, if it was not send by the exchange * @@ -64,7 +67,7 @@ #include <linux/ctype.h> extern char *HiSax_getrev(const char *revision); -const char *dss1_revision = "$Revision: 1.15 $"; +const char *dss1_revision = "$Revision: 1.2 $"; #define MsgHead(ptr, cref, mty) \ *ptr++ = 0x8; \ @@ -721,7 +724,7 @@ dss1up(struct PStack *st, int pr, void *arg) if (skb->data[0] != PROTO_DIS_EURO) { if (st->l3.debug & L3_DEB_PROTERR) { - sprintf(tmp, "dss1up%sunexpected discriminator %x message len %ld state %d", + sprintf(tmp, "dss1up%sunexpected discriminator %x message len %d state %d", (pr == DL_DATA) ? " " : "(broadcast) ", skb->data[0], skb->len, st->l3.state); l3_debug(st, tmp); |