diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-07-16 11:30:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-07-16 11:30:32 -0700 |
| commit | 99298eb615debd41c1fccff05b163d0a29091904 (patch) | |
| tree | b8ab624e250a4faf7d137f9db9b2eacb64fae6b5 /arch/m68k/configs/mvme147_defconfig | |
| parent | 408323581b722c9bd504dd296920f392049a7f52 (diff) | |
| parent | 21b9e722ad28c19c2bc83f18f540b3dbd89bf762 (diff) | |
Merge tag 'm68k-for-v6.11-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven:
- Fix bootup lock-ups on Warp1260, Atari TT, and MegaSTe
- Miscellaneous fixes and improvements
- defconfig updates
* tag 'm68k-for-v6.11-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: cmpxchg: Fix return value for default case in __arch_xchg()
m68k: defconfig: Update defconfigs for v6.10-rc1
m68k: atari: Fix TT bootup freeze / unexpected (SCU) interrupt messages
zorro: Use str_plural() in amiga_zorro_probe()
m68k: emu: Add missing MODULE_DESCRIPTION() macros
m68k: amiga: Turn off Warp1260 interrupts during boot
Diffstat (limited to 'arch/m68k/configs/mvme147_defconfig')
| -rw-r--r-- | arch/m68k/configs/mvme147_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/m68k/configs/mvme147_defconfig b/arch/m68k/configs/mvme147_defconfig index 29b70f27aedd..2248db426081 100644 --- a/arch/m68k/configs/mvme147_defconfig +++ b/arch/m68k/configs/mvme147_defconfig @@ -350,6 +350,7 @@ CONFIG_VXLAN=m CONFIG_GENEVE=m CONFIG_BAREUDP=m CONFIG_GTP=m +CONFIG_PFCP=m CONFIG_MACSEC=m CONFIG_NETCONSOLE=m CONFIG_NETCONSOLE_DYNAMIC=y |