diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h
index fc41fecfe44f..157357ec1441 100644
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -388,8 +388,10 @@ struct mtd_info {
 	/* List of partitions attached to this MTD device */
 	struct list_head partitions;
 
-	struct mtd_part part;
-	struct mtd_master master;
+	union {
+		struct mtd_part part;
+		struct mtd_master master;
+	};
 };
 
 static inline struct mtd_info *mtd_get_master(struct mtd_info *mtd)