From a1d409dae04a9174a08673105fbb8bf84559b0a3 Mon Sep 17 00:00:00 2001 From: "Nicolas S. Dade" Date: Tue, 24 May 2005 01:46:34 -0700 Subject: [PATCH] --- yaml --- r: 4564 b: refs/heads/master c: f1f67a9874f1a4bba1adff6d694aa52e5f52ff1a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mtd/nand/nand_ids.c | 1 + trunk/include/linux/mtd/nand.h | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 44e2be27e062..cb52ce57e6b2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a8aff8ab981cc8ef170e89d85094da722644a7fd +refs/heads/master: f1f67a9874f1a4bba1adff6d694aa52e5f52ff1a diff --git a/trunk/drivers/mtd/nand/nand_ids.c b/trunk/drivers/mtd/nand/nand_ids.c index 79945e6ce2b9..4b2bfae6f501 100644 --- a/trunk/drivers/mtd/nand/nand_ids.c +++ b/trunk/drivers/mtd/nand/nand_ids.c @@ -116,6 +116,7 @@ struct nand_manufacturers nand_manuf_ids[] = { {NAND_MFR_NATIONAL, "National"}, {NAND_MFR_RENESAS, "Renesas"}, {NAND_MFR_STMICRO, "ST Micro"}, + {NAND_MFR_HYNIX, "Hynix"}, {0x0, "Unknown"} }; diff --git a/trunk/include/linux/mtd/nand.h b/trunk/include/linux/mtd/nand.h index cf25c7cfd0ba..bee78969cb21 100644 --- a/trunk/include/linux/mtd/nand.h +++ b/trunk/include/linux/mtd/nand.h @@ -384,6 +384,7 @@ struct nand_chip { #define NAND_MFR_NATIONAL 0x8f #define NAND_MFR_RENESAS 0x07 #define NAND_MFR_STMICRO 0x20 +#define NAND_MFR_HYNIX 0xad /** * struct nand_flash_dev - NAND Flash Device ID Structure