aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/pistachio/patches-4.9/412-mtd-nand-Add-JEDEC-manufacturer-ID-for-Gigadevice.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2017-03-26 12:22:27 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2017-03-26 12:23:19 +0200
commitfb7ea71c15d2bccb8cc6383d3a08921b79713712 (patch)
tree402344f7b2dc8600fb8b8d1ae60eb05f1e3458a8 /target/linux/pistachio/patches-4.9/412-mtd-nand-Add-JEDEC-manufacturer-ID-for-Gigadevice.patch
parent88b125e9a46dd8793aa5eaef8c148e851ceb7463 (diff)
downloadupstream-fb7ea71c15d2bccb8cc6383d3a08921b79713712.tar.gz
upstream-fb7ea71c15d2bccb8cc6383d3a08921b79713712.tar.bz2
upstream-fb7ea71c15d2bccb8cc6383d3a08921b79713712.zip
kernel: update kernel 4.9 to 4.9.17
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/pistachio/patches-4.9/412-mtd-nand-Add-JEDEC-manufacturer-ID-for-Gigadevice.patch')
-rw-r--r--target/linux/pistachio/patches-4.9/412-mtd-nand-Add-JEDEC-manufacturer-ID-for-Gigadevice.patch11
1 files changed, 2 insertions, 9 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 f8ebac5a1d..eceb304006 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
@@ -13,11 +13,9 @@ Signed-off-by: Ezequiel Garcia <ezequiel.garcia@imgtec.com>
include/linux/mtd/nand.h | 1 +
2 files changed, 2 insertions(+)
-diff --git a/drivers/mtd/nand/nand_ids.c b/drivers/mtd/nand/nand_ids.c
-index 2af9869..dc80fcd 100644
--- a/drivers/mtd/nand/nand_ids.c
+++ b/drivers/mtd/nand/nand_ids.c
-@@ -182,6 +182,7 @@ struct nand_manufacturers nand_manuf_ids[] = {
+@@ -182,6 +182,7 @@ struct nand_manufacturers nand_manuf_ids
{NAND_MFR_SANDISK, "SanDisk"},
{NAND_MFR_INTEL, "Intel"},
{NAND_MFR_ATO, "ATO"},
@@ -25,11 +23,9 @@ index 2af9869..dc80fcd 100644
{0x0, "Unknown"}
};
-diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
-index d8905a2..3a00df7 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
-@@ -928,6 +928,7 @@ static inline void nand_set_controller_data(struct nand_chip *chip, void *priv)
+@@ -928,6 +928,7 @@ static inline void nand_set_controller_d
#define NAND_MFR_SANDISK 0x45
#define NAND_MFR_INTEL 0x89
#define NAND_MFR_ATO 0x9b
@@ -37,6 +33,3 @@ index d8905a2..3a00df7 100644
/* The maximum expected count of bytes in the NAND ID sequence */
#define NAND_MAX_ID_LEN 8
---
-2.7.4
-