kernel: add support for kernel 5.4

[openwrt/staging/jogo.git] / target / linux / generic / pending-5.4 / 480-mtd-set-rootfs-to-be-root-dev.patch

diff --git a/target/linux/generic/pending-5.4/480-mtd-set-rootfs-to-be-root-dev.patch b/target/linux/generic/pending-5.4/480-mtd-set-rootfs-to-be-root-dev.patch
index dce0432fac130ddfd397fb5e0ad8c44edb72f6a7..3907ac2368f9e7de60d069a0331a7b306050155b 100644 (file)
--- a/target/linux/generic/pending-5.4/480-mtd-set-rootfs-to-be-root-dev.patch
+++ b/target/linux/generic/pending-5.4/480-mtd-set-rootfs-to-be-root-dev.patch
@@ -12,15 +12,15 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
 
 --- a/drivers/mtd/mtdcore.c
 +++ b/drivers/mtd/mtdcore.c
-@@ -41,6 +41,7 @@
+@@ -27,6 +27,7 @@
  #include <linux/reboot.h>
  #include <linux/leds.h>
  #include <linux/debugfs.h>
 +#include <linux/root_dev.h>
+ #include <linux/nvmem-provider.h>
  
  #include <linux/mtd/mtd.h>
- #include <linux/mtd/partitions.h>
-@@ -593,6 +594,15 @@ int add_mtd_device(struct mtd_info *mtd)
+@@ -698,6 +699,15 @@ int add_mtd_device(struct mtd_info *mtd)
           of this try_ nonsense, and no bitching about it
           either. :) */
        __module_get(THIS_MODULE);
@@ -35,4 +35,4 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
 +
        return 0;
  
- fail_added:
+ fail_nvmem_add: