---

yaml --- r: 332641 b: refs/heads/master c: 95c1b0c h: refs/heads/master i: 332639: cb6938f v: v3
git-mirror · Jul 6, 2012 · f0dfd7a · f0dfd7a
1 parent 723f7a4
commit f0dfd7a
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: 943b35a6da6c66b12a581b914195199bd0815390
+refs/heads/master: 95c1b0ce2ad8bfc0092782a75e86b219eb2c5204
diff --git a/trunk/drivers/mtd/devices/m25p80.c b/trunk/drivers/mtd/devices/m25p80.c
@@ -646,6 +646,7 @@ static const struct spi_device_id m25p_ids[] = {
 	{ "160s33b",  INFO(0x898911, 0, 64 * 1024,  32, 0) },
 	{ "320s33b",  INFO(0x898912, 0, 64 * 1024,  64, 0) },
 	{ "640s33b",  INFO(0x898913, 0, 64 * 1024, 128, 0) },
+	{ "n25q064",  INFO(0x20ba17, 0, 64 * 1024, 128, 0) },
 
 	/* Macronix */
 	{ "mx25l2005a",  INFO(0xc22012, 0, 64 * 1024,   4, SECT_4K) },