aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-10-28 08:53:00 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-28 08:53:00 -0700
commit0ee40c6628434f0535da31deeacc28b61e80d810 (patch)
tree2873b9c932a63943fad22617b8385866e45347f5 /include
parent236fa08168dd82af29a76c31c40b4148403774c0 (diff)
parent2824bc9328467127083c1325f54b67d298c333b2 (diff)
Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block
Diffstat (limited to 'include')
-rw-r--r--include/linux/genhd.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index 01796c41c95..142e1c1e068 100644
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -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;