diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2021-11-15 11:49:56 +0100 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2021-12-13 14:48:13 +0100 |
| commit | 1a0ae068bf6b6f4233b1f31bf48bcbc47b111ef2 (patch) | |
| tree | 17c0cbfb2b316712c7ba3830caec2c8dbff906b9 /arch/m68k/configs/apollo_defconfig | |
| parent | 376e3fdecb0dcae216c0ac559cff066f460bf47b (diff) | |
| download | linux-next-1a0ae068bf6b6f4233b1f31bf48bcbc47b111ef2.tar.gz | |
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/apollo_defconfig')
| -rw-r--r-- | arch/m68k/configs/apollo_defconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_defconfig index 41f3f3b738b3..2db721965520 100644 --- a/arch/m68k/configs/apollo_defconfig +++ b/arch/m68k/configs/apollo_defconfig @@ -298,7 +298,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 @@ -307,7 +306,6 @@ CONFIG_DEVTMPFS_MOUNT=y CONFIG_TEST_ASYNC_DRIVER_PROBE=m CONFIG_CONNECTOR=m 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 |