bcm63xx: refresh patches for kernel 5.4

[openwrt/staging/wigyori.git] / target / linux / bcm63xx / patches-5.4 / 311-bcm63xxpart_use_cfedetection.patch

diff --git a/target/linux/bcm63xx/patches-5.4/311-bcm63xxpart_use_cfedetection.patch b/target/linux/bcm63xx/patches-5.4/311-bcm63xxpart_use_cfedetection.patch
index bca6adbf3c21e0af629b1dc35ac63bbf688b51b2..19ed994b850c9588cb0ef3015a9ec690799a3e88 100644 (file)
--- a/target/linux/bcm63xx/patches-5.4/311-bcm63xxpart_use_cfedetection.patch
+++ b/target/linux/bcm63xx/patches-5.4/311-bcm63xxpart_use_cfedetection.patch
@@ -1,6 +1,6 @@
---- a/drivers/mtd/bcm63xxpart.c
-+++ b/drivers/mtd/bcm63xxpart.c
-@@ -35,6 +35,8 @@
+--- a/drivers/mtd/parsers/bcm63xxpart.c
++++ b/drivers/mtd/parsers/bcm63xxpart.c
+@@ -21,6 +21,8 @@
  #include <linux/mtd/mtd.h>
  #include <linux/mtd/partitions.h>
  #include <linux/of.h>
@@ -9,7 +9,7 @@
  
  #define BCM963XX_CFE_BLOCK_SIZE               SZ_64K  /* always at least 64KiB */
  
-@@ -46,30 +48,6 @@
+@@ -32,30 +34,6 @@
  #define STR_NULL_TERMINATE(x) \
        do { char *_str = (x); _str[sizeof(x) - 1] = 0; } while (0)
  
@@ -40,7 +40,7 @@
  static int bcm63xx_read_nvram(struct mtd_info *master,
        struct bcm963xx_nvram *nvram)
  {
-@@ -152,7 +130,7 @@ static int bcm63xx_parse_cfe_partitions(
+@@ -138,7 +116,7 @@ static int bcm63xx_parse_cfe_partitions(
        struct bcm963xx_nvram *nvram = NULL;
        int ret;