[openwrt/openwrt] mediatek: fix fallout after etron spinand backport

[LEDE Commits]

nbd pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/0c8e5c35c7b37a45a7146a2857ffe2f4cf496898

commit 0c8e5c35c7b37a45a7146a2857ffe2f4cf496898
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Mon Sep 5 11:45:00 2022 +0200

    mediatek: fix fallout after etron spinand backport
    
    Signed-off-by: Felix Fietkau <nbd at nbd.name>
---
 .../340-mtd-spinand-Add-support-for-the-Fidelix-FM35X1GA.patch | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/target/linux/mediatek/patches-5.15/340-mtd-spinand-Add-support-for-the-Fidelix-FM35X1GA.patch b/target/linux/mediatek/patches-5.15/340-mtd-spinand-Add-support-for-the-Fidelix-FM35X1GA.patch
index 4a5d814b3b..823630b3c4 100644
--- a/target/linux/mediatek/patches-5.15/340-mtd-spinand-Add-support-for-the-Fidelix-FM35X1GA.patch
+++ b/target/linux/mediatek/patches-5.15/340-mtd-spinand-Add-support-for-the-Fidelix-FM35X1GA.patch
@@ -18,8 +18,8 @@ Signed-off-by: Davide Fioravanti <pantanastyle at gmail.com>
 +++ b/drivers/mtd/nand/spi/Makefile
 @@ -1,3 +1,3 @@
  # SPDX-License-Identifier: GPL-2.0
--spinand-objs := core.o esmt.o gigadevice.o macronix.o micron.o paragon.o toshiba.o winbond.o xtx.o
-+spinand-objs := core.o esmt.o fidelix.o gigadevice.o macronix.o micron.o paragon.o toshiba.o winbond.o xtx.o
+-spinand-objs := core.o esmt.o etron.o gigadevice.o macronix.o micron.o paragon.o toshiba.o winbond.o xtx.o
++spinand-objs := core.o esmt.o etron.o fidelix.o gigadevice.o macronix.o micron.o paragon.o toshiba.o winbond.o xtx.o
  obj-$(CONFIG_MTD_SPI_NAND) += spinand.o
 --- a/drivers/mtd/nand/spi/core.c
 +++ b/drivers/mtd/nand/spi/core.c
@@ -29,8 +29,8 @@ Signed-off-by: Davide Fioravanti <pantanastyle at gmail.com>
  	&esmt_c8_spinand_manufacturer,
 +	&fidelix_spinand_manufacturer,
  	&gigadevice_spinand_manufacturer,
+ 	&etron_spinand_manufacturer,
  	&macronix_spinand_manufacturer,
- 	&micron_spinand_manufacturer,
 --- /dev/null
 +++ b/drivers/mtd/nand/spi/fidelix.c
 @@ -0,0 +1,76 @@
@@ -112,10 +112,10 @@ Signed-off-by: Davide Fioravanti <pantanastyle at gmail.com>
 +};
 --- a/include/linux/mtd/spinand.h
 +++ b/include/linux/mtd/spinand.h
-@@ -261,6 +261,7 @@ struct spinand_manufacturer {
- 
+@@ -262,6 +262,7 @@ struct spinand_manufacturer {
  /* SPI NAND manufacturers */
  extern const struct spinand_manufacturer esmt_c8_spinand_manufacturer;
+ extern const struct spinand_manufacturer etron_spinand_manufacturer;
 +extern const struct spinand_manufacturer fidelix_spinand_manufacturer;
  extern const struct spinand_manufacturer gigadevice_spinand_manufacturer;
  extern const struct spinand_manufacturer macronix_spinand_manufacturer;