aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/mtd/nand/nand_ids.c1
-rw-r--r--include/linux/mtd/nand.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mtd/nand/nand_ids.c b/drivers/mtd/nand/nand_ids.c
index fbde89105245..dd620c19c619 100644
--- a/drivers/mtd/nand/nand_ids.c
+++ b/drivers/mtd/nand/nand_ids.c
@@ -178,6 +178,7 @@ struct nand_manufacturers nand_manuf_ids[] = {
178 {NAND_MFR_EON, "Eon"}, 178 {NAND_MFR_EON, "Eon"},
179 {NAND_MFR_SANDISK, "SanDisk"}, 179 {NAND_MFR_SANDISK, "SanDisk"},
180 {NAND_MFR_INTEL, "Intel"}, 180 {NAND_MFR_INTEL, "Intel"},
181 {NAND_MFR_ATO, "ATO"},
181 {0x0, "Unknown"} 182 {0x0, "Unknown"}
182}; 183};
183 184
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index b14d190b593a..3d4ea7eb2b68 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -736,6 +736,7 @@ struct nand_chip {
736#define NAND_MFR_EON 0x92 736#define NAND_MFR_EON 0x92
737#define NAND_MFR_SANDISK 0x45 737#define NAND_MFR_SANDISK 0x45
738#define NAND_MFR_INTEL 0x89 738#define NAND_MFR_INTEL 0x89
739#define NAND_MFR_ATO 0x9b
739 740
740/* The maximum expected count of bytes in the NAND ID sequence */ 741/* The maximum expected count of bytes in the NAND ID sequence */
741#define NAND_MAX_ID_LEN 8 742#define NAND_MAX_ID_LEN 8