Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

[karo-tx-linux.git] / include / linux / genhd.h

diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index 847cc1d916348386379c510ee38433e42d4b93d2..5c706765404a85f4d097eba66da659601f8c073a 100644 (file)
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -162,6 +162,7 @@ struct disk_part_tbl {
 };
 
 struct disk_events;
+struct badblocks;
 
 #if defined(CONFIG_BLK_DEV_INTEGRITY)
 
@@ -213,6 +214,7 @@ struct gendisk {
        struct kobject integrity_kobj;
 #endif /* CONFIG_BLK_DEV_INTEGRITY */
        int node_id;
+       struct badblocks *bb;
 };
 
 static inline struct gendisk *part_to_disk(struct hd_struct *part)