diff options
author | Wolfgang Denk <wd@denx.de> | 2007-08-16 12:04:37 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2007-08-16 12:04:37 +0200 |
commit | 592391a6e5c8999e546671ac8efd71a311a03f07 (patch) | |
tree | 5bc810c997cd2a0be418eadaae85caa17102d444 /drivers | |
parent | 002275a3ed8b114885f6702d6d544d0780dfe689 (diff) | |
parent | a5a38f4fd7e5366d706ff6a985f9b6715ddbc98b (diff) |
Merge with /home/wd/git/u-boot/master
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/nand/nand_ids.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/nand/nand_ids.c b/drivers/nand/nand_ids.c index 075cae66b06..6d7e347fba7 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 |