diff options
| author | Takashi Iwai <tiwai@suse.de> | 2026-03-05 17:22:14 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2026-03-05 17:22:14 +0100 |
| commit | 8457669db968c98edb781892d73fa559e1efcbd4 (patch) | |
| tree | adcc5996b2cc6ceb3702421a77144531dd241217 /tools/include/linux | |
| parent | 3d543d9515928e4754a741c338dbcdf68ac47e39 (diff) | |
| parent | 325291b20f8a6f14b9c82edbf5d12e4e71f6adaa (diff) | |
Merge tag 'asoc-fix-v7.0-rc2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v7.0
A moderately large pile of fixes, though none of them are super major,
plus a few new quirks and device IDs.
Diffstat (limited to 'tools/include/linux')
| -rw-r--r-- | tools/include/linux/args.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/include/linux/args.h b/tools/include/linux/args.h index 2e8e65d975c7..14b268f2389a 100644 --- a/tools/include/linux/args.h +++ b/tools/include/linux/args.h @@ -22,7 +22,11 @@ #define COUNT_ARGS(X...) __COUNT_ARGS(, ##X, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0) /* Concatenate two parameters, but allow them to be expanded beforehand. */ +#ifndef __CONCAT #define __CONCAT(a, b) a ## b +#endif +#ifndef CONCATENATE #define CONCATENATE(a, b) __CONCAT(a, b) +#endif #endif /* _LINUX_ARGS_H */ |