--- zzzz-none-000/linux-2.4.17/include/linux/cyclades.h	2000-05-12 18:22:31.000000000 +0000
+++ sangam-fb-322/linux-2.4.17/include/linux/cyclades.h	2004-11-24 13:21:45.000000000 +0000
@@ -1,4 +1,4 @@
-/* $Revision: 3.0 $$Date: 1998/11/02 14:20:59 $
+/* $Revision: 1.1.1.1 $$Date: 2003/06/23 22:18:42 $
  * linux/include/linux/cyclades.h
  *
  * This file was initially written by
@@ -7,6 +7,18 @@
  *
  * This file contains the general definitions for the cyclades.c driver
  *$Log: cyclades.h,v $
+ *Revision 1.1.1.1  2003/06/23 22:18:42  jharrell
+ *Imported kernel sources
+ *
+ *Revision 1.2  2002/11/07 22:50:20  marian
+ *high res timers merge
+ *
+ *Revision 1.1.1.1.4.1  2002/10/28 14:35:28  jharrell
+ *First import of Nick's High Res. Timer support for the Avalanche code base
+ *
+ *Revision 1.1.1.1  2002/03/18 15:12:17  jharrell
+ *2.4.17 sherman import
+ *
  *Revision 3.1  2000/04/19 18:52:52  ivan
  *converted address fields to unsigned long and added fields for physical
  *addresses on cyclades_card structure;
@@ -594,7 +606,7 @@
 	int			xmit_cnt;
         int                     default_threshold;
         int                     default_timeout;
-	unsigned long		jiffies[3];
+	unsigned long		_jiffies[3];
 	unsigned long		rflush_count;
 	struct termios		normal_termios;
 	struct termios		callout_termios;