diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/mtd/mtd.h | 4 | ||||
-rw-r--r-- | include/spi/flash.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h index 71d3c6f49f..be8ad71df4 100644 --- a/include/linux/mtd/mtd.h +++ b/include/linux/mtd/mtd.h @@ -200,7 +200,7 @@ struct mtd_info { void (*put_device) (struct mtd_info *mtd); struct device_d class_dev; - struct device_d *dev; + struct device_d *parent; struct cdev cdev; struct param_d param_size; @@ -251,6 +251,8 @@ static inline void mtd_erase_callback(struct erase_info *instr) } #endif +int mtd_block_isbad(struct mtd_info *mtd, loff_t ofs); + /* * Debugging macro and defines */ diff --git a/include/spi/flash.h b/include/spi/flash.h index fe8d09b41c..c1204e7e61 100644 --- a/include/spi/flash.h +++ b/include/spi/flash.h @@ -19,7 +19,7 @@ struct mtd_partition; * rarely powers of two; and partitions should be sector-aligned. */ struct flash_platform_data { - const char *name; + char *name; struct mtd_partition *parts; unsigned int nr_parts; char *type; |