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@mentor.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Cc: <stable@vger.kernel.org> # 3.18+

diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c
index 35e7e9896b179731c1011f04deb14001b3f6c477..363590d5234bfda9a33f4b84b9297bcc3c531cbd 100644 (file)
--- 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"},
        { },
 };