diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 11:53:00 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 11:53:00 -0400 |
| commit | 0ee40c6628434f0535da31deeacc28b61e80d810 (patch) | |
| tree | 2873b9c932a63943fad22617b8385866e45347f5 /include | |
| parent | 236fa08168dd82af29a76c31c40b4148403774c0 (diff) | |
| parent | 2824bc9328467127083c1325f54b67d298c333b2 (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.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/genhd.h b/include/linux/genhd.h index 01796c41c951..142e1c1e0689 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h | |||
| @@ -119,7 +119,7 @@ struct gendisk { | |||
| 119 | int policy; | 119 | int policy; |
| 120 | 120 | ||
| 121 | atomic_t sync_io; /* RAID */ | 121 | atomic_t sync_io; /* RAID */ |
| 122 | unsigned long stamp, stamp_idle; | 122 | unsigned long stamp; |
| 123 | int in_flight; | 123 | int in_flight; |
| 124 | #ifdef CONFIG_SMP | 124 | #ifdef CONFIG_SMP |
| 125 | struct disk_stats *dkstats; | 125 | struct disk_stats *dkstats; |