Commit 1a0ae068 authored Nov 15, 2021 by Geert Uytterhoeven

m68k: defconfig: Update defconfigs for v5.16-rc1



  - Drop CONFIG_MCTP=m (can no longer be modular since commit
    78476d31 ("mctp: Add flow extension to skb")),
  - Drop CONFIG_BLK_DEV_CRYPTOLOOP=m (removed in commit 47e96246
    ("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

parent 376e3fde

arch/m68k/configs/amiga_defconfig

+0 −2

Original line number	Diff line number	Diff line
		@@ -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

arch/m68k/configs/apollo_defconfig

+0 −2

Original line number	Diff line number	Diff line
		@@ -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

arch/m68k/configs/atari_defconfig

+0 −2

Original line number	Diff line number	Diff line
		@@ -305,7 +305,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
		@@ -318,7 +317,6 @@ CONFIG_PARPORT_ATARI=m
		CONFIG_PARPORT_1284=y
		CONFIG_ATARI_FLOPPY=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

arch/m68k/configs/bvme6000_defconfig

+0 −2

Original line number	Diff line number	Diff line
		@@ -295,7 +295,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
		@@ -304,7 +303,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

arch/m68k/configs/hp300_defconfig

+0 −2

Original line number	Diff line number	Diff line
		@@ -297,7 +297,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
		@@ -306,7 +305,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