diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-11-02 02:57:36 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-11-02 02:57:36 +0300 |
| commit | 03feb7c55c470158ece9afb317c395cd65bd14ac (patch) | |
| tree | be1f4e3a2cd0712398c0f3928cc49a3d97e292ee /arch/m68k/configs/atari_defconfig | |
| parent | 552ebfe022ec67aca4ff2bda0722ed0e28fc90d5 (diff) | |
| parent | 8a3c0a74ae87473589cb881a3854948d40000b7a (diff) | |
| download | linux-03feb7c55c470158ece9afb317c395cd65bd14ac.tar.xz | |
Merge tag 'm68k-for-v5.16-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven:
- A small comma vs semicolon cleanup
- defconfig updates
* tag 'm68k-for-v5.16-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: defconfig: Update defconfigs for v5.15-rc1
m68k: muldi3: Use semicolon instead of comma
Diffstat (limited to 'arch/m68k/configs/atari_defconfig')
| -rw-r--r-- | arch/m68k/configs/atari_defconfig | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_defconfig index dbf1960c6669..3fd0ea135886 100644 --- a/arch/m68k/configs/atari_defconfig +++ b/arch/m68k/configs/atari_defconfig @@ -305,6 +305,7 @@ 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 @@ -452,6 +453,8 @@ CONFIG_UDF_FS=m CONFIG_MSDOS_FS=m CONFIG_VFAT_FS=m CONFIG_EXFAT_FS=m +CONFIG_NTFS3_FS=m +CONFIG_NTFS3_LZX_XPRESS=y CONFIG_PROC_KCORE=y CONFIG_PROC_CHILDREN=y CONFIG_TMPFS=y @@ -558,6 +561,7 @@ CONFIG_CRYPTO_ADIANTUM=m CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_VMAC=m CONFIG_CRYPTO_BLAKE2S=m +CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_SHA3=m @@ -596,7 +600,6 @@ CONFIG_CRC32_SELFTEST=m CONFIG_CRC64=m CONFIG_XZ_DEC_TEST=m CONFIG_GLOB_SELFTEST=m -CONFIG_STRING_SELFTEST=m # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set CONFIG_MAGIC_SYSRQ=y CONFIG_TEST_LOCKUP=m @@ -605,12 +608,12 @@ CONFIG_EARLY_PRINTK=y CONFIG_KUNIT=m CONFIG_KUNIT_ALL_TESTS=m CONFIG_TEST_MIN_HEAP=m -CONFIG_TEST_SORT=m CONFIG_TEST_DIV64=m CONFIG_REED_SOLOMON_TEST=m CONFIG_ATOMIC64_SELFTEST=m CONFIG_ASYNC_RAID6_TEST=m CONFIG_TEST_HEXDUMP=m +CONFIG_STRING_SELFTEST=m CONFIG_TEST_STRING_HELPERS=m CONFIG_TEST_STRSCPY=m CONFIG_TEST_KSTRTOX=m |