[openwrt/openwrt] pistachio: make patches apply again

[LEDE Commits]

hauke pushed a commit to openwrt/openwrt.git, branch master:
https://git.lede-project.org/36f1978a701cc76b2cd2e4c73ce5f2d5d68c4c51

commit 36f1978a701cc76b2cd2e4c73ce5f2d5d68c4c51
Author: Hauke Mehrtens <hauke at hauke-m.de>
AuthorDate: Sat Jan 20 23:36:05 2018 +0100

    pistachio: make patches apply again
    
    Support for Winbond NAND flash detection was added into the generic
    patches and this conflicted with this patch adding Gigadevice support.
    
    Fixes: 02050f7e7d5b ("kernel/4.{4, 9}: add manufacturer ID for Winbond NANDs")
    Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
---
 .../412-mtd-nand-Add-JEDEC-manufacturer-ID-for-Gigadevice.patch       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/target/linux/pistachio/patches-4.9/412-mtd-nand-Add-JEDEC-manufacturer-ID-for-Gigadevice.patch b/target/linux/pistachio/patches-4.9/412-mtd-nand-Add-JEDEC-manufacturer-ID-for-Gigadevice.patch
index eceb304..3fa8c23 100644
--- a/target/linux/pistachio/patches-4.9/412-mtd-nand-Add-JEDEC-manufacturer-ID-for-Gigadevice.patch
+++ b/target/linux/pistachio/patches-4.9/412-mtd-nand-Add-JEDEC-manufacturer-ID-for-Gigadevice.patch
@@ -20,9 +20,9 @@ Signed-off-by: Ezequiel Garcia <ezequiel.garcia at imgtec.com>
  	{NAND_MFR_INTEL, "Intel"},
  	{NAND_MFR_ATO, "ATO"},
 +	{NAND_MFR_GIGADEVICE, "Gigadevice"},
+ 	{NAND_MFR_WINBOND, "Winbond"},
  	{0x0, "Unknown"}
  };
- 
 --- a/include/linux/mtd/nand.h
 +++ b/include/linux/mtd/nand.h
 @@ -928,6 +928,7 @@ static inline void nand_set_controller_d
@@ -30,6 +30,6 @@ Signed-off-by: Ezequiel Garcia <ezequiel.garcia at imgtec.com>
  #define NAND_MFR_INTEL		0x89
  #define NAND_MFR_ATO		0x9b
 +#define NAND_MFR_GIGADEVICE	0xc8
+ #define NAND_MFR_WINBOND	0xef
  
  /* The maximum expected count of bytes in the NAND ID sequence */
- #define NAND_MAX_ID_LEN 8