From 84582cc9369ed50c6bbd25561bfeb9b797eec30f Mon Sep 17 00:00:00 2001 From: Kevin Cernekee Date: Fri, 18 Sep 2009 19:36:42 -0700 Subject: [PATCH] --- yaml --- r: 165491 b: refs/heads/master c: 304e6d5fe294b80e6d3107f99ec241816390ebcc h: refs/heads/master i: 165489: 7881975621077a7ebdbfdeeb24405ad468d83a15 165487: dfeef78467ca7f1fc9043ae27b7d20d47b54e005 v: v3 --- [refs] | 2 +- trunk/drivers/mtd/devices/m25p80.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ebe5b7acadb0..769d0f50f5ef 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dd799983e947539bf3b5c0a502eba650d3dcc29a +refs/heads/master: 304e6d5fe294b80e6d3107f99ec241816390ebcc diff --git a/trunk/drivers/mtd/devices/m25p80.c b/trunk/drivers/mtd/devices/m25p80.c index 9b78869cd8ab..00355862eba9 100644 --- a/trunk/drivers/mtd/devices/m25p80.c +++ b/trunk/drivers/mtd/devices/m25p80.c @@ -633,8 +633,10 @@ static struct flash_info __devinitdata m25p_data [] = { { "s25sl016a", 0x010214, 0, 64 * 1024, 32, }, { "s25sl032a", 0x010215, 0, 64 * 1024, 64, }, { "s25sl064a", 0x010216, 0, 64 * 1024, 128, }, - { "s25sl12800", 0x012018, 0x0300, 256 * 1024, 64, }, + { "s25sl12800", 0x012018, 0x0300, 256 * 1024, 64, }, { "s25sl12801", 0x012018, 0x0301, 64 * 1024, 256, }, + { "s25fl129p0", 0x012018, 0x4d00, 256 * 1024, 64, }, + { "s25fl129p1", 0x012018, 0x4d01, 64 * 1024, 256, }, /* SST -- large erase sizes are "overlays", "sectors" are 4K */ { "sst25vf040b", 0xbf258d, 0, 64 * 1024, 8, SECT_4K, },