projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'iwlwifi-next-for-kalle-2014-12-30' of https://git.kernel.org/pub/scm/linux...
[cascardo/linux.git]
/
drivers
/
mtd
/
nand
/
nand_ids.c
diff --git
a/drivers/mtd/nand/nand_ids.c
b/drivers/mtd/nand/nand_ids.c
index
fbde891
..
dd620c1
100644
(file)
--- a/
drivers/mtd/nand/nand_ids.c
+++ b/
drivers/mtd/nand/nand_ids.c
@@
-178,6
+178,7
@@
struct nand_manufacturers nand_manuf_ids[] = {
{NAND_MFR_EON, "Eon"},
{NAND_MFR_SANDISK, "SanDisk"},
{NAND_MFR_INTEL, "Intel"},
+ {NAND_MFR_ATO, "ATO"},
{0x0, "Unknown"}
};