diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-07-16 21:30:32 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-07-16 21:30:32 +0300 |
commit | 99298eb615debd41c1fccff05b163d0a29091904 (patch) | |
tree | b8ab624e250a4faf7d137f9db9b2eacb64fae6b5 /drivers | |
parent | 408323581b722c9bd504dd296920f392049a7f52 (diff) | |
parent | 21b9e722ad28c19c2bc83f18f540b3dbd89bf762 (diff) | |
download | linux-99298eb615debd41c1fccff05b163d0a29091904.tar.xz |
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 'drivers')
-rw-r--r-- | drivers/zorro/zorro.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/zorro/zorro.c b/drivers/zorro/zorro.c index 2196474ce6ef..4e23d53d269e 100644 --- a/drivers/zorro/zorro.c +++ b/drivers/zorro/zorro.c @@ -18,6 +18,7 @@ #include <linux/platform_device.h> #include <linux/dma-mapping.h> #include <linux/slab.h> +#include <linux/string_choices.h> #include <asm/byteorder.h> #include <asm/setup.h> @@ -152,7 +153,7 @@ static int __init amiga_zorro_probe(struct platform_device *pdev) platform_set_drvdata(pdev, bus); pr_info("Zorro: Probing AutoConfig expansion devices: %u device%s\n", - zorro_num_autocon, zorro_num_autocon == 1 ? "" : "s"); + zorro_num_autocon, str_plural(zorro_num_autocon)); /* First identify all devices ... */ for (i = 0; i < zorro_num_autocon; i++) { |