aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-4.14/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2019-11-25 11:32:39 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2019-11-29 10:00:35 +0100
commit953d9c384f2ef96e57dfd06cdc9ce63815a2c7ab (patch)
treec0264c6ee5ffe4e0aeeb2c30b5b78e6c8139fb3e /target/linux/generic/pending-4.14/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch
parent7581a7bebccbdbca5d486dc8f55e0f16fc60ca87 (diff)
downloadupstream-953d9c384f2ef96e57dfd06cdc9ce63815a2c7ab.tar.gz
upstream-953d9c384f2ef96e57dfd06cdc9ce63815a2c7ab.tar.bz2
upstream-953d9c384f2ef96e57dfd06cdc9ce63815a2c7ab.zip
kernel: bump 4.14 to 4.14.156
Refreshed all patches. Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/generic/pending-4.14/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch')
-rw-r--r--target/linux/generic/pending-4.14/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/pending-4.14/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch b/target/linux/generic/pending-4.14/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch
index 9625a51129..5e70756c4e 100644
--- a/target/linux/generic/pending-4.14/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch
+++ b/target/linux/generic/pending-4.14/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch
@@ -46,7 +46,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
errors per {size} bytes".
--- a/drivers/mtd/maps/physmap_of_core.c
+++ b/drivers/mtd/maps/physmap_of_core.c
-@@ -114,37 +114,9 @@ static struct mtd_info *obsolete_probe(s
+@@ -105,37 +105,9 @@ static struct mtd_info *obsolete_probe(s
static const char * const part_probe_types_def[] = {
"cmdlinepart", "RedBoot", "ofpart", "ofoldpart", NULL };
@@ -84,7 +84,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
const struct of_device_id *match;
struct device_node *dp = dev->dev.of_node;
struct resource res;
-@@ -310,14 +282,8 @@ static int of_flash_probe(struct platfor
+@@ -293,14 +265,8 @@ static int of_flash_probe(struct platfor
info->cmtd->dev.parent = &dev->dev;
mtd_set_of_node(info->cmtd, dp);