diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-12 07:59:05 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-01-12 07:59:05 -0500 |
| commit | 163849ea9b4c5d50fbd324692461983d18faadad (patch) | |
| tree | 7176a18fea53560eb4092aa103d94a266ab4e60d /include/linux/genhd.h | |
| parent | 2138301e1687bd4f22aa2b4df4829b6ffdae19bc (diff) | |
| parent | 5ee518ecbcb5934e284ea51a19a939c891f5f7ea (diff) | |
Merge branch 'for-2.6.33' into for-2.6.34
Diffstat (limited to 'include/linux/genhd.h')
| -rw-r--r-- | include/linux/genhd.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/genhd.h b/include/linux/genhd.h index 297df45ffd0a..c6c0c41af35f 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h | |||
| @@ -91,6 +91,7 @@ struct hd_struct { | |||
| 91 | sector_t start_sect; | 91 | sector_t start_sect; |
| 92 | sector_t nr_sects; | 92 | sector_t nr_sects; |
| 93 | sector_t alignment_offset; | 93 | sector_t alignment_offset; |
| 94 | unsigned int discard_alignment; | ||
| 94 | struct device __dev; | 95 | struct device __dev; |
| 95 | struct kobject *holder_dir; | 96 | struct kobject *holder_dir; |
| 96 | int policy, partno; | 97 | int policy, partno; |