summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorMarkus Klotzbuecher <mk@denx.de>2007-09-17 17:12:45 +0200
committerMarkus Klotzbuecher <mk@pollux.denx.de>2007-09-17 17:12:45 +0200
commitf930922f061ea7bf585296859d1c14194c24b840 (patch)
treec46b9f120f7c55f5baf8b6ac3048ba759e10a512 /include/linux
parent97213f32416ead885deafea86774e912ffd60ad0 (diff)
parent67c31036acaaaa992fc346cc89db0909a7e733c4 (diff)
Merge with git://www.denx.de/git/u-boot.git
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/mtd/nand.h1
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