--- zzzz-none-000/linux-2.4.17/drivers/char/cyclades.c	2001-09-14 21:04:07.000000000 +0000
+++ sangam-fb-322/linux-2.4.17/drivers/char/cyclades.c	2004-11-24 13:23:24.000000000 +0000
@@ -2,7 +2,7 @@
 #define	Z_WAKE
 #undef	Z_EXT_CHARS_IN_BUFFER
 static char rcsid[] =
-"$Revision: 2.3.2.8 $$Date: 2000/07/06 18:14:16 $";
+"$Revision: 1.1.1.1 $$Date: 2003/06/23 22:18:25 $";
 
 /*
  *  linux/drivers/char/cyclades.c
@@ -25,6 +25,18 @@
  * This version supports shared IRQ's (only for PCI boards).
  *
  * $Log: cyclades.c,v $
+ * Revision 1.1.1.1  2003/06/23 22:18:25  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:11:48  jharrell
+ * 2.4.17 sherman import
+ *
  * Revision 2.3.2.8   2000/07/06 18:14:16 ivan
  * Fixed the PCI detection function to work properly on Alpha systems.
  * Implemented support for TIOCSERGETLSR ioctl.
@@ -1610,7 +1622,7 @@
 
     if ( char_count ) {
 	info->last_active = jiffies;
-	info->jiffies[1] = jiffies;
+	info->_jiffies[1] = jiffies;
 
 #ifdef CY_ENABLE_MONITORING
 	info->mon.int_count++;
@@ -1720,7 +1732,7 @@
 	    char_count--;
 	    info->icount.tx++;
 	    info->last_active = jiffies;
-	    info->jiffies[2] = jiffies;
+	    info->_jiffies[2] = jiffies;
 	}
 #ifdef BLOCKMOVE
 	while(0 < (small_count = 
@@ -1739,7 +1751,7 @@
 	    info->xmit_tail = 
 		(info->xmit_tail + small_count) & (SERIAL_XMIT_SIZE - 1);
 	    info->last_active = jiffies;
-	    info->jiffies[2] = jiffies;
+	    info->_jiffies[2] = jiffies;
 	}
 #else
 	while (info->xmit_cnt && char_count){
@@ -1752,7 +1764,7 @@
 	    char_count--;
 	    info->icount.tx++;
 	    info->last_active = jiffies;
-	    info->jiffies[2] = jiffies;
+	    info->_jiffies[2] = jiffies;
 	}
 #endif
     ztxdone:
@@ -5650,9 +5662,9 @@
                     info->read_status_mask = 0;
                     /* info->timeout */
 		    /* Bentson's vars */
-                    info->jiffies[0] = 0;
-                    info->jiffies[1] = 0;
-                    info->jiffies[2] = 0;
+                    info->_jiffies[0] = 0;
+                    info->_jiffies[1] = 0;
+                    info->_jiffies[2] = 0;
                     info->rflush_count = 0;
 #ifdef CONFIG_CYZ_INTR
 		    cyz_rx_full_timer[port].function = NULL;