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/emu | |
| parent | 408323581b722c9bd504dd296920f392049a7f52 (diff) | |
| parent | 21b9e722ad28c19c2bc83f18f540b3dbd89bf762 (diff) | |
| download | linux-99298eb615debd41c1fccff05b163d0a29091904.tar.gz linux-99298eb615debd41c1fccff05b163d0a29091904.tar.bz2 linux-99298eb615debd41c1fccff05b163d0a29091904.zip | |
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/emu')
| -rw-r--r-- | arch/m68k/emu/nfblock.c | 1 | ||||
| -rw-r--r-- | arch/m68k/emu/nfcon.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/m68k/emu/nfblock.c b/arch/m68k/emu/nfblock.c index 874fe9588773..83410f8184ec 100644 --- a/arch/m68k/emu/nfblock.c +++ b/arch/m68k/emu/nfblock.c @@ -194,4 +194,5 @@ static void __exit nfhd_exit(void) module_init(nfhd_init); module_exit(nfhd_exit); +MODULE_DESCRIPTION("Atari NatFeat block device driver"); MODULE_LICENSE("GPL"); diff --git a/arch/m68k/emu/nfcon.c b/arch/m68k/emu/nfcon.c index 17b2987c2bf5..d41260672e24 100644 --- a/arch/m68k/emu/nfcon.c +++ b/arch/m68k/emu/nfcon.c @@ -173,4 +173,5 @@ static void __exit nfcon_exit(void) module_init(nfcon_init); module_exit(nfcon_exit); +MODULE_DESCRIPTION("Atari NatFeat console driver"); MODULE_LICENSE("GPL"); |