diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 12:30:16 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 12:30:16 -0400 |
| commit | 15dbb5a3f971a28040ae6cbcd8bbdf19b629fa83 (patch) | |
| tree | e65562d7300ac653207b1e45ec7e5960ddf78fff /include/linux/genhd.h | |
| parent | be697c3f137c9ed808753bbbc5d7751c6e5303fc (diff) | |
| parent | 5fadd053d9bb4345ec6f405d24db4e7eb49cf81e (diff) | |
Merge branch 'master'
Diffstat (limited to 'include/linux/genhd.h')
| -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 01796c41c95..142e1c1e068 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; |