---

yaml --- r: 231711 b: refs/heads/master c: 8fffed8 h: refs/heads/master i: 231709: 7ad2daa 231707: a13c559 231703: 09b1a81 231695: 7e76724 231679: 3390df4 v: v3
git-mirror · Jan 6, 2011 · 7036d5e · 7036d5e
1 parent b19e480
commit 7036d5e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 24ac9a94f9e21ea71d877b0c80867d625b68bec2
+refs/heads/master: 8fffed8cfdd511056cb17c70f525017fbb643b94
diff --git a/trunk/drivers/mtd/devices/m25p80.c b/trunk/drivers/mtd/devices/m25p80.c
@@ -653,7 +653,7 @@ static const struct spi_device_id m25p_ids[] = {
 	{ "at26f004",   INFO(0x1f0400, 0, 64 * 1024,  8, SECT_4K) },
 	{ "at26df081a", INFO(0x1f4501, 0, 64 * 1024, 16, SECT_4K) },
 	{ "at26df161a", INFO(0x1f4601, 0, 64 * 1024, 32, SECT_4K) },
-	{ "at26df321",  INFO(0x1f4701, 0, 64 * 1024, 64, SECT_4K) },
+	{ "at26df321",  INFO(0x1f4700, 0, 64 * 1024, 64, SECT_4K) },
 
 	/* EON -- en25pxx */
 	{ "en25p32", INFO(0x1c2016, 0, 64 * 1024,  64, 0) },