From: Bin Meng <bin.meng@windriver.com>
Date: Sat, 2 May 2020 04:30:21 +0000 (-0700)
Subject: m68k: Drop CONFIG_MTD_M25P80 in stmark2_defconfig
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e00091071615378e66291c61ea02d02d15a2cc7e;p=linux.git

m68k: Drop CONFIG_MTD_M25P80 in stmark2_defconfig

Drop CONFIG_MTD_M25P80 that was removed in
commit b35b9a10362d ("mtd: spi-nor: Move m25p80 code in spi-nor.c")

Signed-off-by: Bin Meng <bin.meng@windriver.com>
Signed-off-by: Greg Ungerer <gerg@linux-m68k.org>
---

diff --git a/arch/m68k/configs/stmark2_defconfig b/arch/m68k/configs/stmark2_defconfig
index 27fa9465d19d2..2b746f55f419f 100644
--- a/arch/m68k/configs/stmark2_defconfig
+++ b/arch/m68k/configs/stmark2_defconfig
@@ -48,7 +48,6 @@ CONFIG_MTD_CFI_STAA=y
 CONFIG_MTD_ROM=y
 CONFIG_MTD_COMPLEX_MAPPINGS=y
 CONFIG_MTD_PLATRAM=y
-CONFIG_MTD_M25P80=y
 CONFIG_MTD_SPI_NOR=y
 # CONFIG_INPUT_KEYBOARD is not set
 # CONFIG_INPUT_MOUSE is not set