From fe8cd6c0e15a3f9cbbaf70d64dbe06fe6ab9f6d8 Mon Sep 17 00:00:00 2001
From: Aubrey Lee <aubreylee@gmail.com>
Date: Tue, 5 Sep 2006 05:55:07 -0500
Subject: [PATCH] --- yaml --- r: 33999 b: refs/heads/master c:
 fa6c220a7f01257b1c2c4203d48aaaedb0c4416f h: refs/heads/master i:   33997:
 c7b87f3e108c1a3dfd202c11ba36d69217e5fe2c   33995:
 99ef5a93216f025bd49876018018641b80c387b4   33991:
 71c4a8c2cdc2cbc03450fa257a9d9df2ef866b85   33983:
 b1699c223aa8571e2ebd11fad8406140a360cf53 v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/mtd/devices/m25p80.c | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index cd4560776153..2b82b45d12b1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0a7d5f8ce960e74fa22986bda4af488539796e49
+refs/heads/master: fa6c220a7f01257b1c2c4203d48aaaedb0c4416f
diff --git a/trunk/drivers/mtd/devices/m25p80.c b/trunk/drivers/mtd/devices/m25p80.c
index a8466141e914..ef4a731ca5c2 100644
--- a/trunk/drivers/mtd/devices/m25p80.c
+++ b/trunk/drivers/mtd/devices/m25p80.c
@@ -406,13 +406,13 @@ struct flash_info {
 
 static struct flash_info __devinitdata m25p_data [] = {
 	/* REVISIT: fill in JEDEC ids, for parts that have them */
-	{ "m25p05", 0x05, 0x0000, 32 * 1024, 2 },
-	{ "m25p10", 0x10, 0x0000, 32 * 1024, 4 },
-	{ "m25p20", 0x11, 0x0000, 64 * 1024, 4 },
-	{ "m25p40", 0x12, 0x0000, 64 * 1024, 8 },
+	{ "m25p05", 0x05, 0x2010, 32 * 1024, 2 },
+	{ "m25p10", 0x10, 0x2011, 32 * 1024, 4 },
+	{ "m25p20", 0x11, 0x2012, 64 * 1024, 4 },
+	{ "m25p40", 0x12, 0x2013, 64 * 1024, 8 },
 	{ "m25p80", 0x13, 0x0000, 64 * 1024, 16 },
-	{ "m25p16", 0x14, 0x0000, 64 * 1024, 32 },
-	{ "m25p32", 0x15, 0x0000, 64 * 1024, 64 },
+	{ "m25p16", 0x14, 0x2015, 64 * 1024, 32 },
+	{ "m25p32", 0x15, 0x2016, 64 * 1024, 64 },
 	{ "m25p64", 0x16, 0x2017, 64 * 1024, 128 },
 };