summaryrefslogtreecommitdiff
path: root/arch/m68k
diff options
context:
space:
mode:
authorBin Meng <bin.meng@windriver.com>2020-05-01 21:30:21 -0700
committerGreg Ungerer <gerg@linux-m68k.org>2020-05-30 10:51:42 +1000
commite00091071615378e66291c61ea02d02d15a2cc7e (patch)
tree05ee0f1ba0c0e07f79c8e455909535167d4e01e9 /arch/m68k
parentc3f4ec050f56eeab7c1f290321f9b762c95bd332 (diff)
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>
Diffstat (limited to 'arch/m68k')
-rw-r--r--arch/m68k/configs/stmark2_defconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/m68k/configs/stmark2_defconfig b/arch/m68k/configs/stmark2_defconfig
index 27fa9465d19d..2b746f55f419 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