[U-Boot-Users] "3.micron":(1 of 1) [PATCH][NAND] Define the Vendor Id for Micron NAND Flash

[Ladislav Michl]

On Tue, Mar 27, 2007 at 06:14:32PM +0200, Ulf Samuelsson wrote:
> Author: Ulf Samuelsson <ulf at atmel.com>
> Date:     2007-03-27
> 
> Subject:	"3.micron":(1 of  1)     [PATCH][NAND] 	Define the Vendor Id for Micron NAND Flash
> 
> CHANGELOG:
>     [PATCH][NAND] 	Define the Vendor Id for Micron NAND Flash

This patch contained trailing whitespace. Rediffed.

Signed-off-by: Ulf Samuelsson <ulf at atmel.com>
Signed-off-by: Ladislav Michl <ladis at linux-mips.org>

diff --git a/drivers/nand/nand_ids.c b/drivers/nand/nand_ids.c
index 8b58736..70fdfd3 100644
--- a/drivers/nand/nand_ids.c
+++ b/drivers/nand/nand_ids.c
@@ -123,6 +123,7 @@ struct nand_manufacturers nand_manuf_ids[] = {
 	{NAND_MFR_NATIONAL, "National"},
 	{NAND_MFR_RENESAS, "Renesas"},
 	{NAND_MFR_STMICRO, "ST Micro"},
+	{NAND_MFR_MICRON, "Micron"},
 	{0x0, "Unknown"}
 };
 #endif
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index 4b48564..49ff80f 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -348,6 +348,7 @@ struct nand_chip {
 #define NAND_MFR_NATIONAL	0x8f
 #define NAND_MFR_RENESAS	0x07
 #define NAND_MFR_STMICRO	0x20
+#define NAND_MFR_MICRON		0x2c
 
 /**
  * struct nand_flash_dev - NAND Flash Device ID Structure