diff options
| author | Haavard Skinnemoen <hskinnemoen@atmel.com> | 2007-10-02 19:05:53 +0200 |
|---|---|---|
| committer | Haavard Skinnemoen <hskinnemoen@atmel.com> | 2007-10-02 19:05:53 +0200 |
| commit | b90296fc39a33f84bb2b0aa79bf997be495ba791 (patch) | |
| tree | 4ea0d61df25d10fe7552aedf781fd167f4c670fe /include/linux | |
| parent | e80e585b00fbbab7ad1bf71619741f2c5b029ab7 (diff) | |
| parent | 527c80f012030fa0b51f8594847ec56c9317e9b1 (diff) | |
Merge commit 'origin/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 |