From e3e1e98a8c21e0ab7712a171e0d6ed77116d7c32 Mon Sep 17 00:00:00 2001 From: Brian Norris Date: Tue, 22 May 2012 07:30:47 -0700 Subject: [PATCH] --- yaml --- r: 332629 b: refs/heads/master c: b1ccfab31a0bbcb103989cba3b08df0776ff90fe h: refs/heads/master i: 332627: 0377fd66e792e0b8cd52b8ac86fd09360163d306 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 e13a9ee8f995..b8d986928261 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bfea1d4ee53c4628a7bbdcfe3b026f8ce4032a1c +refs/heads/master: b1ccfab31a0bbcb103989cba3b08df0776ff90fe diff --git a/trunk/drivers/mtd/nand/nand_ids.c b/trunk/drivers/mtd/nand/nand_ids.c index 621b70b7a159..509a9f6706f3 100644 --- a/trunk/drivers/mtd/nand/nand_ids.c +++ b/trunk/drivers/mtd/nand/nand_ids.c @@ -176,6 +176,7 @@ struct nand_manufacturers nand_manuf_ids[] = { {NAND_MFR_MICRON, "Micron"}, {NAND_MFR_AMD, "AMD"}, {NAND_MFR_MACRONIX, "Macronix"}, + {NAND_MFR_EON, "Eon"}, {0x0, "Unknown"} }; diff --git a/trunk/include/linux/mtd/nand.h b/trunk/include/linux/mtd/nand.h index 57977c640529..53dcf4973c1b 100644 --- a/trunk/include/linux/mtd/nand.h +++ b/trunk/include/linux/mtd/nand.h @@ -559,6 +559,7 @@ struct nand_chip { #define NAND_MFR_MICRON 0x2c #define NAND_MFR_AMD 0x01 #define NAND_MFR_MACRONIX 0xc2 +#define NAND_MFR_EON 0x92 /** * struct nand_flash_dev - NAND Flash Device ID Structure