Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block

2005-10-28 08:53:00 -07:00
parent 236fa08168 2824bc9328
commit 0ee40c6628
4 changed files with 24 additions and 18 deletions
@@ -119,7 +119,7 @@ struct gendisk {
 	int policy;

 	atomic_t sync_io;		/* RAID */
-	unsigned long stamp, stamp_idle;
+	unsigned long stamp;
 	int in_flight;
 #ifdef	CONFIG_SMP
 	struct disk_stats *dkstats;