mtd: m25p80: n25q064 is Micron, not Intel/Numonyx

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=e66e280c36e09e4573089862e7dc2ade9e680088
Commit:     e66e280c36e09e4573089862e7dc2ade9e680088
Parent:     b5a6c3095f0b8c69b1e5c4bacb7ee13069f2688d
Author:     Brian Norris <computersforpeace at gmail.com>
AuthorDate: Fri Feb 22 14:07:22 2013 -0800
Committer:  David Woodhouse <David.Woodhouse at intel.com>
CommitDate: Fri Apr 5 12:04:45 2013 +0100

    mtd: m25p80: n25q064 is Micron, not Intel/Numonyx
    
    Signed-off-by: Brian Norris <computersforpeace at gmail.com>
    Acked-by: Peter Korsgaard <jacmet at sunsite.dk>
    Signed-off-by: Artem Bityutskiy <artem.bityutskiy at linux.intel.com>
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
---
 drivers/mtd/devices/m25p80.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index fcdcfc7..45f143a 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/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) },