Commit d019b4693b4f9c01891d87159c14cdbb04ea1c23
Committed by
Greg Kroah-Hartman
Greg Kroah-Hartman
1 parent
8513071f76
MTD: m25p80: fix inconsistency in m25p_ids compared to spi_nor_ids
commit 834b686552d9018e2d17bd56ac5361b78bcc75b8 upstream. 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Showing 1 changed file with 3 additions and 3 deletions Side-by-side Diff
drivers/mtd/devices/m25p80.c
| ... | ... | @@ -300,11 +300,11 @@ |
| 300 | 300 | {"m45pe10"}, {"m45pe80"}, {"m45pe16"}, |
| 301 | 301 | {"m25pe20"}, {"m25pe80"}, {"m25pe16"}, |
| 302 | 302 | {"m25px16"}, {"m25px32"}, {"m25px32-s0"}, {"m25px32-s1"}, |
| 303 | - {"m25px64"}, | |
| 303 | + {"m25px64"}, {"m25px80"}, | |
| 304 | 304 | {"w25x10"}, {"w25x20"}, {"w25x40"}, {"w25x80"}, |
| 305 | 305 | {"w25x16"}, {"w25x32"}, {"w25q32"}, {"w25q32dw"}, |
| 306 | - {"w25x64"}, {"w25q64"}, {"w25q128"}, {"w25q80"}, | |
| 307 | - {"w25q80bl"}, {"w25q128"}, {"w25q256"}, {"cat25c11"}, | |
| 306 | + {"w25x64"}, {"w25q64"}, {"w25q80"}, {"w25q80bl"}, | |
| 307 | + {"w25q128"}, {"w25q256"}, {"cat25c11"}, | |
| 308 | 308 | {"cat25c03"}, {"cat25c09"}, {"cat25c17"}, {"cat25128"}, |
| 309 | 309 | { }, |
| 310 | 310 | }; |