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 /include/linux | |
| parent | 002275a3ed8b114885f6702d6d544d0780dfe689 (diff) | |
| parent | a5a38f4fd7e5366d706ff6a985f9b6715ddbc98b (diff) | |
Merge with /home/wd/git/u-boot/master
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mtd/nand.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h index 4b485643a1..49ff80fd3a 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 |