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 /include/uapi | |
| 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 'include/uapi')
| -rw-r--r-- | include/uapi/linux/zorro_ids.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/uapi/linux/zorro_ids.h b/include/uapi/linux/zorro_ids.h index 6e574d7b7d79..393f2ee9c042 100644 --- a/include/uapi/linux/zorro_ids.h +++ b/include/uapi/linux/zorro_ids.h @@ -449,6 +449,9 @@ #define ZORRO_PROD_VMC_ISDN_BLASTER_Z2 ZORRO_ID(VMC, 0x01, 0) #define ZORRO_PROD_VMC_HYPERCOM_4 ZORRO_ID(VMC, 0x02, 0) +#define ZORRO_MANUF_CSLAB 0x1400 +#define ZORRO_PROD_CSLAB_WARP_1260 ZORRO_ID(CSLAB, 0x65, 0) + #define ZORRO_MANUF_INFORMATION 0x157C #define ZORRO_PROD_INFORMATION_ISDN_ENGINE_I ZORRO_ID(INFORMATION, 0x64, 0) |