diff options
| author | James Morris <jmorris@namei.org> | 2009-08-10 18:33:01 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-08-10 18:33:01 -0400 |
| commit | 8b4bfc7feb005d84e2bd0831d8331a304e9d6483 (patch) | |
| tree | a13891d7264aefeea65e60cc956e8fa704032cd9 /include/linux/mtd/partitions.h | |
| parent | 896a6de40ef3814525632609799af909338f50c3 (diff) | |
| parent | 85dfd81dc57e8183a277ddd7a56aa65c96f3f487 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'include/linux/mtd/partitions.h')
| -rw-r--r-- | include/linux/mtd/partitions.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/mtd/partitions.h b/include/linux/mtd/partitions.h index af6dcb992bc3..b70313d33ff8 100644 --- a/include/linux/mtd/partitions.h +++ b/include/linux/mtd/partitions.h | |||
| @@ -47,6 +47,8 @@ struct mtd_partition { | |||
| 47 | #define MTDPART_SIZ_FULL (0) | 47 | #define MTDPART_SIZ_FULL (0) |
| 48 | 48 | ||
| 49 | 49 | ||
| 50 | struct mtd_info; | ||
| 51 | |||
| 50 | int add_mtd_partitions(struct mtd_info *, const struct mtd_partition *, int); | 52 | int add_mtd_partitions(struct mtd_info *, const struct mtd_partition *, int); |
| 51 | int del_mtd_partitions(struct mtd_info *); | 53 | int del_mtd_partitions(struct mtd_info *); |
| 52 | 54 | ||