Merge tag 'for-5.8/drivers-2020-06-01' of git://git.kernel.dk/linux-block

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

diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index f0d6d77..392aad5 100644 (file)
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -159,8 +159,6 @@ struct disk_part_tbl {
 struct disk_events;
 struct badblocks;
 
-#if defined(CONFIG_BLK_DEV_INTEGRITY)
-
 struct blk_integrity {
        const struct blk_integrity_profile      *profile;
        unsigned char                           flags;
@@ -169,8 +167,6 @@ struct blk_integrity {
        unsigned char                           tag_size;
 };
 
-#endif /* CONFIG_BLK_DEV_INTEGRITY */
-
 struct gendisk {
        /* major, first_minor and minors are input parameters only,
         * don't use directly.  Use disk_devt() and disk_max_parts().