diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-03-07 09:25:18 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-03-07 09:25:18 +0100 |
| commit | e358922a74b01e6272c77caf01bc78a8295cc7d7 (patch) | |
| tree | 2148056adbec4af52d03f00eea3e9b0bd478f33c /include/linux | |
| parent | 98615784a654f42e3914e5b401ddf24e50bdf64a (diff) | |
| parent | d5e38fc91345a60566ab92ebbea238c50be7c74b (diff) | |
| download | barebox-e358922a74b01e6272c77caf01bc78a8295cc7d7.tar.gz barebox-e358922a74b01e6272c77caf01bc78a8295cc7d7.tar.xz | |
Merge branch 'for-next/mtd'
Conflicts:
drivers/mtd/core.c
net/eth.c
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mtd/mtd.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h index 402e4978b1..e02204a503 100644 --- a/include/linux/mtd/mtd.h +++ b/include/linux/mtd/mtd.h @@ -217,6 +217,9 @@ struct mtd_info { /* If true erasing bad blocks is allowed, this is set via a device parameter */ bool allow_erasebad; int p_allow_erasebad; + + struct mtd_info *master; + uint32_t master_offset; }; int mtd_erase(struct mtd_info *mtd, struct erase_info *instr); @@ -272,7 +275,7 @@ struct mtd_notifier { struct mtd_info *mtd_add_partition(struct mtd_info *mtd, off_t offset, size_t size, unsigned long flags, const char *name); -void mtd_del_partition(struct mtd_info *mtd); +int mtd_del_partition(struct mtd_info *mtd); extern void register_mtd_user (struct mtd_notifier *new); extern int unregister_mtd_user (struct mtd_notifier *old); |