diff options
| author | Thomas Zimmermann <[email protected]> | 2024-02-26 15:10:55 +0100 |
|---|---|---|
| committer | Thomas Zimmermann <[email protected]> | 2024-02-26 15:12:53 +0100 |
| commit | b0fda2fcb472454474b858a06419249d7eca56db (patch) | |
| tree | b9e111922464bb944c719a26c49e7fe1edb27095 /tools/include/linux | |
| parent | 32ca5ebfde9a0deb50cedfa37646f86bb319542b (diff) | |
| parent | f112b68f273fb0121cb64e0c3ac06adcb91e32b8 (diff) | |
Merge drm/drm-next into drm-misc-next-fixes
Backmerging from drm/drm-next to prepare drm-misc-next-fixes for
the rest of the release cycle.
Signed-off-by: Thomas Zimmermann <[email protected]>
Diffstat (limited to 'tools/include/linux')
| -rw-r--r-- | tools/include/linux/compiler_types.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/include/linux/compiler_types.h b/tools/include/linux/compiler_types.h index 1bdd834bdd57..d09f9dc172a4 100644 --- a/tools/include/linux/compiler_types.h +++ b/tools/include/linux/compiler_types.h @@ -36,8 +36,8 @@ #include <linux/compiler-gcc.h> #endif -#ifndef asm_volatile_goto -#define asm_volatile_goto(x...) asm goto(x) +#ifndef asm_goto_output +#define asm_goto_output(x...) asm goto(x) #endif #endif /* __LINUX_COMPILER_TYPES_H */ |