aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas S. Dade <daden@symbol.com>2005-05-24 04:46:34 -0400
committerThomas Gleixner <tglx@mtd.linutronix.de>2005-05-27 04:40:27 -0400
commitf1f67a9874f1a4bba1adff6d694aa52e5f52ff1a (patch)
tree1ce057ca42957603fbbbd10bd83f249bb31d742a
parenta8aff8ab981cc8ef170e89d85094da722644a7fd (diff)
[MTD] NAND: Add Hynix to manufacturer list
Signed-off-by: Nicolas S. Dade <daden@symbol.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-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 79945e6ce2b9..4b2bfae6f501 100644
--- a/drivers/mtd/nand/nand_ids.c
+++ b/drivers/mtd/nand/nand_ids.c
@@ -116,6 +116,7 @@ struct nand_manufacturers nand_manuf_ids[] = {
116 {NAND_MFR_NATIONAL, "National"}, 116 {NAND_MFR_NATIONAL, "National"},
117 {NAND_MFR_RENESAS, "Renesas"}, 117 {NAND_MFR_RENESAS, "Renesas"},
118 {NAND_MFR_STMICRO, "ST Micro"}, 118 {NAND_MFR_STMICRO, "ST Micro"},
119 {NAND_MFR_HYNIX, "Hynix"},
119 {0x0, "Unknown"} 120 {0x0, "Unknown"}
120}; 121};
121 122
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index cf25c7cfd0ba..bee78969cb21 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -384,6 +384,7 @@ struct nand_chip {
384#define NAND_MFR_NATIONAL 0x8f 384#define NAND_MFR_NATIONAL 0x8f
385#define NAND_MFR_RENESAS 0x07 385#define NAND_MFR_RENESAS 0x07
386#define NAND_MFR_STMICRO 0x20 386#define NAND_MFR_STMICRO 0x20
387#define NAND_MFR_HYNIX 0xad
387 388
388/** 389/**
389 * struct nand_flash_dev - NAND Flash Device ID Structure 390 * struct nand_flash_dev - NAND Flash Device ID Structure