diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-16 14:02:32 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-11-16 14:02:32 +0100 |
| commit | 9749c2f16f61048a66a98a95b6a1e88d4f491cf0 (patch) | |
| tree | 529b4a220e337e6450d810b88c49c08c32f65ed6 /include | |
| parent | 856f60dbd157126241cf9033514137849bb5ca22 (diff) | |
| parent | 4104dd917388943f5b0ae87d1360738675c338b0 (diff) | |
| download | barebox-9749c2f16f61048a66a98a95b6a1e88d4f491cf0.tar.gz barebox-9749c2f16f61048a66a98a95b6a1e88d4f491cf0.tar.xz | |
Merge branch 'for-next/mtd'
Conflicts:
arch/arm/configs/at91sam9x5ek_defconfig
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; |