---

yaml --- r: 332671 b: refs/heads/master c: 4800399 h: refs/heads/master i: 332669: eeebf86 332667: 35caa26 332663: 6a3d400 332655: c3af622 332639: cb6938f 332607: 9f25ab2 332543: b713f64 v: v3
git-mirror · Jul 17, 2012 · 98c4c07 · 98c4c07
1 parent 9e8000c
commit 98c4c07
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e0dd89c56edc9274c513dbd2ba6dc8229aeeaa44
+refs/heads/master: 4800399e335658aae632f587f6759a860f584804
diff --git a/trunk/drivers/mtd/devices/m25p80.c b/trunk/drivers/mtd/devices/m25p80.c
@@ -702,6 +702,7 @@ static const struct spi_device_id m25p_ids[] = {
 	{ "m25p32",  INFO(0x202016,  0,  64 * 1024,  64, 0) },
 	{ "m25p64",  INFO(0x202017,  0,  64 * 1024, 128, 0) },
 	{ "m25p128", INFO(0x202018,  0, 256 * 1024,  64, 0) },
+	{ "n25q032", INFO(0x20ba16,  0,  64 * 1024,  64, 0) },
 
 	{ "m25p05-nonjedec",  INFO(0, 0,  32 * 1024,   2, 0) },
 	{ "m25p10-nonjedec",  INFO(0, 0,  32 * 1024,   4, 0) },