From 1a1d77dd589de5a567fa95e36aa6999c704ceca4 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Mon, 28 Aug 2000 22:00:09 +0000
Subject: Merge with 2.4.0-test7.

---
 drivers/isdn/hisax/l3_1tr6.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'drivers/isdn/hisax/l3_1tr6.c')

diff --git a/drivers/isdn/hisax/l3_1tr6.c b/drivers/isdn/hisax/l3_1tr6.c
index ee56447c8..831d788b5 100644
--- a/drivers/isdn/hisax/l3_1tr6.c
+++ b/drivers/isdn/hisax/l3_1tr6.c
@@ -1,4 +1,4 @@
-/* $Id: l3_1tr6.c,v 2.11 2000/06/26 08:59:14 keil Exp $
+/* $Id: l3_1tr6.c,v 2.12 2000/08/20 07:31:30 keil Exp $
  *
  *  German 1TR6 D-channel protocol
  *
@@ -17,7 +17,7 @@
 #include <linux/ctype.h>
 
 extern char *HiSax_getrev(const char *revision);
-const char *l3_1tr6_revision = "$Revision: 2.11 $";
+const char *l3_1tr6_revision = "$Revision: 2.12 $";
 
 #define MsgHead(ptr, cref, mty, dis) \
 	*ptr++ = dis; \
@@ -883,7 +883,7 @@ down1tr6(struct PStack *st, int pr, void *arg)
 		} else {
 			proc->chan = chan;
 			chan->proc = proc;
-			memcpy (&proc->para.setup, &chan->setup, sizeof (chan->setup));
+			memcpy(&proc->para.setup, &chan->setup, sizeof(setup_parm));
 			proc->callref = cr;
 		}
 	} else {
-- 
cgit v1.2.3