ar71xx: merge 3.2 fixes

[openwrt.git] / target / linux / ar71xx / files / drivers / mtd / tplinkpart.c

diff --git a/target/linux/ar71xx/files/drivers/mtd/tplinkpart.c b/target/linux/ar71xx/files/drivers/mtd/tplinkpart.c
index fc13e25..674df66 100644 (file)
--- a/target/linux/ar71xx/files/drivers/mtd/tplinkpart.c
+++ b/target/linux/ar71xx/files/drivers/mtd/tplinkpart.c
@@ -108,7 +108,7 @@ static int tplink_check_rootfs_magic(struct mtd_info *mtd, size_t offset)
 
 static int tplink_parse_partitions(struct mtd_info *master,
                                   struct mtd_partition **pparts,
-                                  unsigned long origin)
+                                  struct mtd_part_parser_data *data)
 {
        struct mtd_partition *parts;
        struct tplink_fw_header *header;