aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-01-22 18:36:49 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-01-22 18:36:49 +0000
commit9be1b9164404c6e048619a1749b14413749ddca1 (patch)
treee0974ad4f809d638b6293eb8937ff32c95a9a826
parent809fe38e4166834dcccf48519863b05cb2930bbc (diff)
downloadupstream-9be1b9164404c6e048619a1749b14413749ddca1.tar.gz
upstream-9be1b9164404c6e048619a1749b14413749ddca1.tar.bz2
upstream-9be1b9164404c6e048619a1749b14413749ddca1.zip
generic: allow to build myloader mtd parser for 3.2+
SVN-Revision: 29858
-rw-r--r--target/linux/generic/files/drivers/mtd/myloader.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/target/linux/generic/files/drivers/mtd/myloader.c b/target/linux/generic/files/drivers/mtd/myloader.c
index 51c037459f..a13752dd98 100644
--- a/target/linux/generic/files/drivers/mtd/myloader.c
+++ b/target/linux/generic/files/drivers/mtd/myloader.c
@@ -14,6 +14,8 @@
*/
#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/version.h>
#include <linux/slab.h>
#include <linux/init.h>
#include <linux/vmalloc.h>
@@ -30,9 +32,15 @@ struct part_data {
char names[MYLO_MAX_PARTITIONS][PART_NAME_LEN];
};
-int myloader_parse_partitions(struct mtd_info *master,
- struct mtd_partition **pparts,
- unsigned long origin)
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0))
+static int myloader_parse_partitions(struct mtd_info *master,
+ struct mtd_partition **pparts,
+ struct mtd_part_parser_data *data)
+#else
+static int myloader_parse_partitions(struct mtd_info *master,
+ struct mtd_partition **pparts,
+ unsigned long origin)
+#endif
{
struct part_data *buf;
struct mylo_partition_table *tab;