git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[pandora-kernel.git]
/
include
/
linux
/
mtd
/
nand.h
diff --git
a/include/linux/mtd/nand.h
b/include/linux/mtd/nand.h
index
9752388
..
cf197ad
100644
(file)
--- a/
include/linux/mtd/nand.h
+++ b/
include/linux/mtd/nand.h
@@
-431,6
+431,7
@@
struct nand_chip {
#define NAND_MFR_RENESAS 0x07
#define NAND_MFR_STMICRO 0x20
#define NAND_MFR_HYNIX 0xad
+#define NAND_MFR_MICRON 0x2c
/**
* struct nand_flash_dev - NAND Flash Device ID Structure