2
0
forked from Ivasoft/openwrt

adm5120: make patches apply again

Fix patches not applying anymore since r46654.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>

SVN-Revision: 46714
This commit is contained in:
Jonas Gorski
2015-08-23 19:11:07 +00:00
parent 2d379e796f
commit 548630d74e
2 changed files with 17 additions and 17 deletions

View File

@@ -17,16 +17,16 @@
---help---
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
@@ -29,6 +29,8 @@
#include <linux/kmod.h>
@@ -30,6 +30,8 @@
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
#include <linux/of.h>
+#include <linux/root_dev.h>
+#include <linux/magic.h>
#include <linux/err.h>
#include "mtdcore.h"
@@ -52,7 +54,7 @@ struct mtd_part {
@@ -53,7 +55,7 @@ struct mtd_part {
* the pointer to that structure with this macro.
*/
#define PART(x) ((struct mtd_part *)(x))
@@ -35,7 +35,7 @@
/*
* MTD methods which simply translate the effective address and pass through
@@ -705,6 +707,144 @@ int mtd_del_partition(struct mtd_info *m
@@ -706,6 +708,144 @@ int mtd_del_partition(struct mtd_info *m
}
EXPORT_SYMBOL_GPL(mtd_del_partition);
@@ -180,7 +180,7 @@
/*
* This function, given a master MTD object and a partition table, creates
* and registers slave MTD objects which are bound to the master according to
@@ -721,6 +861,9 @@ int add_mtd_partitions(struct mtd_info *
@@ -722,6 +862,9 @@ int add_mtd_partitions(struct mtd_info *
struct mtd_part *slave;
uint64_t cur_offset = 0;
int i;
@@ -190,7 +190,7 @@
printk(KERN_NOTICE "Creating %d MTD partitions on \"%s\":\n", nbparts, master->name);
@@ -735,12 +878,53 @@ int add_mtd_partitions(struct mtd_info *
@@ -736,12 +879,53 @@ int add_mtd_partitions(struct mtd_info *
add_mtd_device(&slave->mtd);