patch-2.4.0-test5 linux/drivers/isdn/avmb1/b1pcmcia.c

• Lines: 26
• Date: Mon Jul 24 18:48:49 2000
• Orig file: v2.4.0-test4/linux/drivers/isdn/avmb1/b1pcmcia.c
• Orig date: Wed Apr 26 16:34:07 2000

diff -u --recursive --new-file v2.4.0-test4/linux/drivers/isdn/avmb1/b1pcmcia.c linux/drivers/isdn/avmb1/b1pcmcia.c
@@ -1,11 +1,15 @@
 /*
- * $Id: b1pcmcia.c,v 1.9 2000/04/03 13:29:24 calle Exp $
+ * $Id: b1pcmcia.c,v 1.10 2000/05/06 00:52:36 kai Exp $
  * 
  * Module for AVM B1/M1/M2 PCMCIA-card.
  * 
  * (c) Copyright 1999 by Carsten Paeth (calle@calle.in-berlin.de)
  * 
  * $Log: b1pcmcia.c,v $
+ * Revision 1.10  2000/05/06 00:52:36  kai
+ * merged changes from kernel tree
+ * fixed timer and net_device->name breakage
+ *
  * Revision 1.9  2000/04/03 13:29:24  calle
  * make Tim Waugh happy (module unload races in 2.3.99-pre3).
  * no real problem there, but now it is much cleaner ...
@@ -79,7 +83,7 @@
 #include "capilli.h"
 #include "avmcard.h"
 
-static char *revision = "$Revision: 1.9 $";
+static char *revision = "$Revision: 1.10 $";
 
 /* ------------------------------------------------------------- */