Merge branch 'for-3.0-important' of git://git.drbd.org/linux-2.6-drbd into for-linus

[~andy/linux] / include / linux / genhd.h

diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index b78956b3c2e749076078cf74e439144c447c9058..300d7582006e49f6ea08a3df09fc9070748c5256 100644 (file)
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -100,6 +100,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;