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 git://git.infradead.org/battery-2.6
[pandora-kernel.git]
/
drivers
/
mtd
/
nand
/
nand_ids.c
diff --git
a/drivers/mtd/nand/nand_ids.c
b/drivers/mtd/nand/nand_ids.c
index
2fc674a
..
a3e3ab0
100644
(file)
--- a/
drivers/mtd/nand/nand_ids.c
+++ b/
drivers/mtd/nand/nand_ids.c
@@
-141,6
+141,7
@@
struct nand_manufacturers nand_manuf_ids[] = {
{NAND_MFR_STMICRO, "ST Micro"},
{NAND_MFR_HYNIX, "Hynix"},
{NAND_MFR_MICRON, "Micron"},
+ {NAND_MFR_AMD, "AMD"},
{0x0, "Unknown"}
};