--- zzzz-none-000/linux-2.4.17/drivers/block/floppy.c	2001-12-21 17:41:53.000000000 +0000
+++ sangam-fb-322/linux-2.4.17/drivers/block/floppy.c	2004-11-24 13:23:44.000000000 +0000
@@ -635,7 +635,7 @@
 static struct output_log {
 	unsigned char data;
 	unsigned char status;
-	unsigned long jiffies;
+	unsigned long _jiffies;
 } output_log[OLOGSIZE];
 
 static int output_log_pos;
@@ -1163,7 +1163,7 @@
 #ifdef FLOPPY_SANITY_CHECK
 		output_log[output_log_pos].data = byte;
 		output_log[output_log_pos].status = status;
-		output_log[output_log_pos].jiffies = jiffies;
+		output_log[output_log_pos]._jiffies = jiffies;
 		output_log_pos = (output_log_pos + 1) % OLOGSIZE;
 #endif
 		return 0;
@@ -1851,7 +1851,7 @@
 		printk("%2x %2x %lu\n",
 		       output_log[(i+output_log_pos) % OLOGSIZE].data,
 		       output_log[(i+output_log_pos) % OLOGSIZE].status,
-		       output_log[(i+output_log_pos) % OLOGSIZE].jiffies);
+		       output_log[(i+output_log_pos) % OLOGSIZE]._jiffies);
 	printk("last result at %lu\n", resultjiffies);
 	printk("last redo_fd_request at %lu\n", lastredo);
 	for (i=0; i<resultsize; i++){