MTD: m25p80: fix inconsistency in m25p_ids compared to spi_nor_ids

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=834b686552d9018e2d17bd56ac5361b78bcc75b8
Commit:     834b686552d9018e2d17bd56ac5361b78bcc75b8
Parent:     a95ce92e4b289228c51114dd19f714388093d52b
Author:     Alison Chaiken <alison_chaiken at mentor.com>
AuthorDate: Mon Nov 10 16:54:54 2014 +0100
Committer:  Brian Norris <computersforpeace at gmail.com>
CommitDate: Tue Nov 25 23:09:29 2014 -0800

    MTD: m25p80: fix inconsistency in m25p_ids compared to spi_nor_ids
    
    As stated in a5b7616c5, "mtd: m25p80,spi-nor: Fix module aliases for
    m25p80", m25p_ids[] in m25p80.c needs to be kept in sync with
    spi_nor_ids[] in spi-nor.c. The change here corrects a misalignment.
    
    (We were missing m25px80 and we had a duplicate w25q128.)
    
    Signed-off-by: Alison Chaiken <alison_chaiken at mentor.com>
    Signed-off-by: Brian Norris <computersforpeace at gmail.com>
    Cc: <stable at vger.kernel.org> # 3.18+
---
 drivers/mtd/devices/m25p80.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index 35e7e98..363590d 100644
--- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c
@@ -292,11 +292,11 @@ static const struct spi_device_id m25p_ids[] = {
 	{"m45pe10"},	{"m45pe80"},	{"m45pe16"},
 	{"m25pe20"},	{"m25pe80"},	{"m25pe16"},
 	{"m25px16"},	{"m25px32"},	{"m25px32-s0"},	{"m25px32-s1"},
-	{"m25px64"},
+	{"m25px64"},	{"m25px80"},
 	{"w25x10"},	{"w25x20"},	{"w25x40"},	{"w25x80"},
 	{"w25x16"},	{"w25x32"},	{"w25q32"},	{"w25q32dw"},
-	{"w25x64"},	{"w25q64"},	{"w25q128"},	{"w25q80"},
-	{"w25q80bl"},	{"w25q128"},	{"w25q256"},	{"cat25c11"},
+	{"w25x64"},	{"w25q64"},	{"w25q80"},	{"w25q80bl"},
+	{"w25q128"},	{"w25q256"},	{"cat25c11"},
 	{"cat25c03"},	{"cat25c09"},	{"cat25c17"},	{"cat25128"},
 	{ },
 };