aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/genhd.h
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-10-28 12:30:29 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-10-28 12:30:29 -0400
commit35ebbae2836a361330b784706b7140c90a346a53 (patch)
treeada3c046a8b6bfdf21bcb0932b4b65c95c2af073 /include/linux/genhd.h
parentc6a33e2464edd87f8c12cc2d11369a5b44c65b77 (diff)
parent5fadd053d9bb4345ec6f405d24db4e7eb49cf81e (diff)
downloadkernel_samsung_aries-35ebbae2836a361330b784706b7140c90a346a53.zip
kernel_samsung_aries-35ebbae2836a361330b784706b7140c90a346a53.tar.gz
kernel_samsung_aries-35ebbae2836a361330b784706b7140c90a346a53.tar.bz2
Merge branch 'master'
Diffstat (limited to 'include/linux/genhd.h')
-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 01796c4..142e1c1 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;