patch-2.4.0-test7 linux/drivers/isdn/icn/icn.c

• Lines: 26
• Date: Mon Aug 21 07:49:03 2000
• Orig file: v2.4.0-test6/linux/drivers/isdn/icn/icn.c
• Orig date: Thu May 11 15:30:07 2000

diff -u --recursive --new-file v2.4.0-test6/linux/drivers/isdn/icn/icn.c linux/drivers/isdn/icn/icn.c
@@ -1,4 +1,4 @@
-/* $Id: icn.c,v 1.62 1999/09/06 07:29:35 fritz Exp $
+/* $Id: icn.c,v 1.63 2000/05/06 00:52:39 kai Exp $
 
  * ISDN low-level module for the ICN active ISDN-Card.
  *
@@ -19,6 +19,10 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Log: icn.c,v $
+ * Revision 1.63  2000/05/06 00:52:39  kai
+ * merged changes from kernel tree
+ * fixed timer and net_device->name breakage
+ *
  * Revision 1.62  1999/09/06 07:29:35  fritz
  * Changed my mail-address.
  *
@@ -247,7 +251,7 @@
 #undef MAP_DEBUG
 
 static char
-*revision = "$Revision: 1.62 $";
+*revision = "$Revision: 1.63 $";
 
 static int icn_addcard(int, char *, char *);