diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-04-26 20:22:04 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-04-26 20:22:04 +0300 |
| commit | 6a713827cece73136bca63a93e7f9a35dd009d3e (patch) | |
| tree | 86294c502e217b5c99e0f57bdbd710b0a75f34a9 /arch/m68k/configs/hp300_defconfig | |
| parent | 69f737ed3a1c0e7619565bb4c01dff5ec8991d85 (diff) | |
| parent | 34e5269bf987aff9a33ad3ab4f5d65c02913cbc1 (diff) | |
| download | linux-6a713827cece73136bca63a93e7f9a35dd009d3e.tar.xz | |
Merge tag 'm68k-for-v5.13-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven:
- defconfig updates
- Use common scripts for syscall table and header generation
- Fix timers on MVME platforms
- Fix lock imbalance in cacheflush syscall
- Minor fixes and improvements
* tag 'm68k-for-v5.13-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: sun3x: Remove unneeded semicolon
m68k: Add missing mmap_read_lock() to sys_cacheflush()
m68k: fpsp040,ifpsp060: Remove meaningless EXTRA_LDFLAGS
m68k: fpsp040: Remove meaningless $(OS_OBJS)
m68k: mvme147,mvme16x: Don't wipe PCC timer config bits
m68k: syscalls: switch to generic syscallhdr.sh
m68k: syscalls: switch to generic syscalltbl.sh
m68k: defconfig: Update defconfigs for v5.12-rc1
m68k: mm: Fix flatmem memory model setup
Diffstat (limited to 'arch/m68k/configs/hp300_defconfig')
| -rw-r--r-- | arch/m68k/configs/hp300_defconfig | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/m68k/configs/hp300_defconfig b/arch/m68k/configs/hp300_defconfig index 8f8d5968713b..8c908fc5c191 100644 --- a/arch/m68k/configs/hp300_defconfig +++ b/arch/m68k/configs/hp300_defconfig @@ -538,12 +538,8 @@ CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_VMAC=m CONFIG_CRYPTO_BLAKE2S=m CONFIG_CRYPTO_MICHAEL_MIC=m -CONFIG_CRYPTO_RMD128=m CONFIG_CRYPTO_RMD160=m -CONFIG_CRYPTO_RMD256=m -CONFIG_CRYPTO_RMD320=m CONFIG_CRYPTO_SHA3=m -CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_WP512=m CONFIG_CRYPTO_AES=y CONFIG_CRYPTO_AES_TI=m @@ -556,7 +552,6 @@ CONFIG_CRYPTO_CAST6=m CONFIG_CRYPTO_DES=m CONFIG_CRYPTO_FCRYPT=m CONFIG_CRYPTO_KHAZAD=m -CONFIG_CRYPTO_SALSA20=m CONFIG_CRYPTO_SEED=m CONFIG_CRYPTO_SERPENT=m CONFIG_CRYPTO_SM4=m |