diff options
| author | Greg KH <greg@press.(none)> | 2005-10-28 13:13:16 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-10-28 13:13:16 -0400 |
| commit | 6fbfddcb52d8d9fa2cd209f5ac2a1c87497d55b5 (patch) | |
| tree | c0414e89678fcef7ce3493e048d855bde781ae8d /include/linux/genhd.h | |
| parent | 1a222bca26ca691e83be1b08f5e96ae96d0d8cae (diff) | |
| parent | 27d1097d39509494706eaa2620ef3b1e780a3224 (diff) | |
Merge ../bleed-2.6
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 78af34840c69..eabdb5cce357 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; |