Merge commit 'origin/master' into next

[linux-2.6-block.git] / include / linux / genhd.h

diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index 297df45ffd0ad27e8219aaf3715a00d030f5bf54..c6c0c41af35fda29c5f9e1429bd3db4784780bf8 100644 (file)
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -91,6 +91,7 @@ struct hd_struct {
        sector_t start_sect;
        sector_t nr_sects;
        sector_t alignment_offset;
+       unsigned int discard_alignment;
        struct device __dev;
        struct kobject *holder_dir;
        int policy, partno;