summaryrefslogtreecommitdiffstats
path: root/arch/m68k/configs/amiga_defconfig
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2021-11-15 11:49:56 +0100
committerGeert Uytterhoeven <geert@linux-m68k.org>2021-12-13 14:48:13 +0100
commit1a0ae068bf6b6f4233b1f31bf48bcbc47b111ef2 (patch)
tree17c0cbfb2b316712c7ba3830caec2c8dbff906b9 /arch/m68k/configs/amiga_defconfig
parentm68k: Enable memtest functionality (diff)
downloadlinux-1a0ae068bf6b6f4233b1f31bf48bcbc47b111ef2.tar.xz
linux-1a0ae068bf6b6f4233b1f31bf48bcbc47b111ef2.zip
m68k: defconfig: Update defconfigs for v5.16-rc1
- Drop CONFIG_MCTP=m (can no longer be modular since commit 78476d315e190533 ("mctp: Add flow extension to skb")), - Drop CONFIG_BLK_DEV_CRYPTOLOOP=m (removed in commit 47e9624616c80c98 ("block: remove support for cryptoloop and the xor transfer")). Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Link: https://lore.kernel.org/r/20211115104956.2084032-1-geert@linux-m68k.org
Diffstat (limited to 'arch/m68k/configs/amiga_defconfig')
-rw-r--r--arch/m68k/configs/amiga_defconfig2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_defconfig
index e2b14ea99342..a4b6c7108465 100644
--- a/arch/m68k/configs/amiga_defconfig
+++ b/arch/m68k/configs/amiga_defconfig
@@ -302,7 +302,6 @@ CONFIG_MPLS_ROUTING=m
CONFIG_MPLS_IPTUNNEL=m
CONFIG_NET_NSH=m
CONFIG_AF_KCM=m
-CONFIG_MCTP=m
# CONFIG_WIRELESS is not set
CONFIG_PSAMPLE=m
CONFIG_NET_IFE=m
@@ -317,7 +316,6 @@ CONFIG_PARPORT_1284=y
CONFIG_AMIGA_FLOPPY=y
CONFIG_AMIGA_Z2RAM=y
CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_CRYPTOLOOP=m
CONFIG_BLK_DEV_DRBD=m
CONFIG_BLK_DEV_NBD=m
CONFIG_BLK_DEV_RAM=y