diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 13:24:08 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 13:24:08 -0500 |
| commit | b3ce1debe2685383a9ad6ace9c49869c3968c013 (patch) | |
| tree | dcb606fac467d6ce78a9c608a1e0d2323af44f2b /drivers/mtd/redboot.c | |
| parent | 5b2f7ffcb734d3046144dfbd5ac6d76254a9e522 (diff) | |
| parent | c2965f1129ee54afcc4ef293ff0f25fa3a7e7392 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6
Some manual fixups for clashing kfree() cleanups etc.
Diffstat (limited to 'drivers/mtd/redboot.c')
| -rw-r--r-- | drivers/mtd/redboot.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mtd/redboot.c b/drivers/mtd/redboot.c index 13f9e992bef8..7b7ca5ab5ae4 100644 --- a/drivers/mtd/redboot.c +++ b/drivers/mtd/redboot.c | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * $Id: redboot.c,v 1.17 2004/11/22 11:33:56 ijc Exp $ | 2 | * $Id: redboot.c,v 1.18 2005/11/07 11:14:21 gleixner Exp $ |
| 3 | * | 3 | * |
| 4 | * Parse RedBoot-style Flash Image System (FIS) tables and | 4 | * Parse RedBoot-style Flash Image System (FIS) tables and |
| 5 | * produce a Linux partition array to match. | 5 | * produce a Linux partition array to match. |
| @@ -39,7 +39,7 @@ static inline int redboot_checksum(struct fis_image_desc *img) | |||
| 39 | return 1; | 39 | return 1; |
| 40 | } | 40 | } |
| 41 | 41 | ||
| 42 | static int parse_redboot_partitions(struct mtd_info *master, | 42 | static int parse_redboot_partitions(struct mtd_info *master, |
| 43 | struct mtd_partition **pparts, | 43 | struct mtd_partition **pparts, |
| 44 | unsigned long fis_origin) | 44 | unsigned long fis_origin) |
| 45 | { | 45 | { |