From 7036d5e4f22e253eb0c2fd1f26abb889320b7572 Mon Sep 17 00:00:00 2001 From: Aleksandr Koltsoff Date: Tue, 4 Jan 2011 10:42:35 +0200 Subject: [PATCH] --- yaml --- r: 231711 b: refs/heads/master c: 8fffed8cfdd511056cb17c70f525017fbb643b94 h: refs/heads/master i: 231709: 7ad2daae557fd7bfcd246715c9a391133560ae41 231707: a13c5591c5401194c9492a2c4c139496acc4f1ba 231703: 09b1a819810f189313bee182b67b5ad026488c6e 231695: 7e76724dedaba9f365c627fb4ecdee4f03191b08 231679: 3390df45e2233295ffab25137bb13e49580fb2ca 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 5114bce4b139..9c88970418ea 100644 --- 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 index 9c59ff6b6926..e4eba6cc1b2e 100644 --- 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) },