From 1a598c21dd4254e3fda23c8f750870db32f2ce2c Mon Sep 17 00:00:00 2001 From: Brian Norris Date: Fri, 22 Feb 2013 14:07:22 -0800 Subject: [PATCH] --- yaml --- r: 374725 b: refs/heads/master c: e66e280c36e09e4573089862e7dc2ade9e680088 h: refs/heads/master i: 374723: 4d9842a9ce7b67e37b69646153d42bdf073a68c8 v: v3 --- [refs] | 2 +- trunk/drivers/mtd/devices/m25p80.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a6024510b3c2..44a85bbeb35a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b5a6c3095f0b8c69b1e5c4bacb7ee13069f2688d +refs/heads/master: e66e280c36e09e4573089862e7dc2ade9e680088 diff --git a/trunk/drivers/mtd/devices/m25p80.c b/trunk/drivers/mtd/devices/m25p80.c index fcdcfc77b1b7..45f143ac5b93 100644 --- a/trunk/drivers/mtd/devices/m25p80.c +++ b/trunk/drivers/mtd/devices/m25p80.c @@ -741,7 +741,6 @@ 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) }, @@ -757,6 +756,7 @@ static const struct spi_device_id m25p_ids[] = { { "mx66l51235l", INFO(0xc2201a, 0, 64 * 1024, 1024, 0) }, /* Micron */ + { "n25q064", INFO(0x20ba17, 0, 64 * 1024, 128, 0) }, { "n25q128a11", INFO(0x20bb18, 0, 64 * 1024, 256, 0) }, { "n25q128a13", INFO(0x20ba18, 0, 64 * 1024, 256, 0) }, { "n25q256a", INFO(0x20ba19, 0, 64 * 1024, 512, SECT_4K) },