diff options
| -rw-r--r-- | drivers/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/nand/nand_ids.c b/drivers/nand/nand_ids.c index 8b58736bc..70fdfd3f5 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 4b485643a..49ff80fd3 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 |