diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2022-02-07 14:10:08 +0100 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2022-02-28 12:00:11 +0100 |
| commit | ee55c9c5734e34d7bf40c4f91d181622630626ff (patch) | |
| tree | 5dfd8591c66d0bc6d97d10cb9ae67ae4d72d1b0a /arch/m68k/configs/apollo_defconfig | |
| parent | m68k: mm: Remove check for VM_IO to fix deferred I/O (diff) | |
| download | linux-ee55c9c5734e34d7bf40c4f91d181622630626ff.tar.xz linux-ee55c9c5734e34d7bf40c4f91d181622630626ff.zip | |
m68k: defconfig: Update defconfigs for v5.17-rc3
- Drop CONFIG_NFT_COUNTER=m (removed in commit 023223dfbfb34fcc
("netfilter: nf_tables: make counter support built-in")),
- Drop CONFIG_NF_FLOW_TABLE_IPV4=m and CONFIG_NF_FLOW_TABLE_IPV6=m
(can no longer be enabled since commit c42ba4290b2147aa ("netfilter:
flowtable: remove ipv4/ipv6 modules")),
- Enable the new option for legacy fbcon hardware acceleration code on
all platforms that have a frame buffer device that can make use of
it,
- Drop CONFIG_TEST_HASH=m (replaced by auto-modular
CONFIG_HASH_KUNIT_TEST in commit 0acc968f352336a4 ("test_hash.c:
refactor into kunit")),
- Enable modular build of the new siphash selftest.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Link: https://lore.kernel.org/r/20220123125543.2658445-1-geert@linux-m68k.org
Link: https://lore.kernel.org/r/20220207131008.2202977-1-geert@linux-m68k.org
Diffstat (limited to 'arch/m68k/configs/apollo_defconfig')
| -rw-r--r-- | arch/m68k/configs/apollo_defconfig | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_defconfig index a77269c6e5ba..405997b61447 100644 --- a/arch/m68k/configs/apollo_defconfig +++ b/arch/m68k/configs/apollo_defconfig @@ -100,7 +100,6 @@ CONFIG_NF_TABLES_NETDEV=y CONFIG_NFT_NUMGEN=m CONFIG_NFT_CT=m CONFIG_NFT_FLOW_OFFLOAD=m -CONFIG_NFT_COUNTER=m CONFIG_NFT_CONNLIMIT=m CONFIG_NFT_LOG=m CONFIG_NFT_LIMIT=m @@ -200,7 +199,6 @@ CONFIG_IP_SET_LIST_SET=m CONFIG_NFT_DUP_IPV4=m CONFIG_NFT_FIB_IPV4=m CONFIG_NF_TABLES_ARP=y -CONFIG_NF_FLOW_TABLE_IPV4=m CONFIG_NF_LOG_ARP=m CONFIG_NF_LOG_IPV4=m CONFIG_IP_NF_IPTABLES=m @@ -225,7 +223,6 @@ CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARP_MANGLE=m CONFIG_NFT_DUP_IPV6=m CONFIG_NFT_FIB_IPV6=m -CONFIG_NF_FLOW_TABLE_IPV6=m CONFIG_IP6_NF_IPTABLES=m CONFIG_IP6_NF_MATCH_AH=m CONFIG_IP6_NF_MATCH_EUI64=m @@ -393,6 +390,7 @@ CONFIG_PTP_1588_CLOCK=m # CONFIG_HWMON is not set CONFIG_FB=y CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION=y CONFIG_LOGO=y # CONFIG_LOGO_LINUX_VGA16 is not set # CONFIG_LOGO_LINUX_CLUT224 is not set @@ -599,7 +597,7 @@ CONFIG_TEST_UUID=m CONFIG_TEST_XARRAY=m CONFIG_TEST_OVERFLOW=m CONFIG_TEST_RHASHTABLE=m -CONFIG_TEST_HASH=m +CONFIG_TEST_SIPHASH=m CONFIG_TEST_IDA=m CONFIG_TEST_BITOPS=m CONFIG_TEST_VMALLOC=m |