From: Alison Chaiken <alison_chaiken@mentor.com>
Date: Mon, 10 Nov 2014 15:54:54 +0000 (+0100)
Subject: MTD: m25p80: fix inconsistency in m25p_ids compared to spi_nor_ids
X-Git-Tag: omap-for-v3.19/fixes-rc1~56^2~15
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=834b686552d9018e2d17bd56ac5361b78bcc75b8;p=pandora-kernel.git

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+
---

Reading git-diff-tree failed