diff options
author | sshahrom@micron.com <sshahrom@micron.com> | 2007-03-21 21:48:02 -0400 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2007-04-17 13:27:06 -0400 |
commit | 8c60e5475d8ca614d712cd3e2fe7330480709e02 (patch) | |
tree | b0039cd0008277f532dbe462f6bb33877ceae77d | |
parent | 53043002ef6cc0369fd5c5fa0a257f290ba6a3a6 (diff) |
[MTD][NAND] Add Micron Manufacturer ID
Add Micron Manufacturer ID.
Signed-off-by: Shahrom Sharif <sshahrom@micron.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
-rw-r--r-- | drivers/mtd/nand/nand_ids.c | 1 | ||||
-rw-r--r-- | include/linux/mtd/nand.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/mtd/nand/nand_ids.c b/drivers/mtd/nand/nand_ids.c index 2e2cdf2fc91d..900207769167 100644 --- a/drivers/mtd/nand/nand_ids.c +++ b/drivers/mtd/nand/nand_ids.c | |||
@@ -137,6 +137,7 @@ struct nand_manufacturers nand_manuf_ids[] = { | |||
137 | {NAND_MFR_RENESAS, "Renesas"}, | 137 | {NAND_MFR_RENESAS, "Renesas"}, |
138 | {NAND_MFR_STMICRO, "ST Micro"}, | 138 | {NAND_MFR_STMICRO, "ST Micro"}, |
139 | {NAND_MFR_HYNIX, "Hynix"}, | 139 | {NAND_MFR_HYNIX, "Hynix"}, |
140 | {NAND_MFR_MICRON, "Micron"}, | ||
140 | {0x0, "Unknown"} | 141 | {0x0, "Unknown"} |
141 | }; | 142 | }; |
142 | 143 | ||
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h index 97523887fe5d..cf197ad62da6 100644 --- a/include/linux/mtd/nand.h +++ b/include/linux/mtd/nand.h | |||
@@ -431,6 +431,7 @@ struct nand_chip { | |||
431 | #define NAND_MFR_RENESAS 0x07 | 431 | #define NAND_MFR_RENESAS 0x07 |
432 | #define NAND_MFR_STMICRO 0x20 | 432 | #define NAND_MFR_STMICRO 0x20 |
433 | #define NAND_MFR_HYNIX 0xad | 433 | #define NAND_MFR_HYNIX 0xad |
434 | #define NAND_MFR_MICRON 0x2c | ||
434 | 435 | ||
435 | /** | 436 | /** |
436 | * struct nand_flash_dev - NAND Flash Device ID Structure | 437 | * struct nand_flash_dev - NAND Flash Device ID Structure |