diff options
| author | Takashi Iwai <tiwai@suse.de> | 2026-04-01 15:42:56 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2026-04-01 15:43:00 +0300 |
| commit | 0542972950ef26670a5696e43c0ea2b7b6ac96d4 (patch) | |
| tree | 9a38714da776c84a22efcdd8d82905bd7a9903a6 /tools/include/linux/args.h | |
| parent | 579e7b820de5dd5124585413bb5e9c278d255436 (diff) | |
| parent | a0dafdbd1049a8ea661a1a471be1b840bd8aed13 (diff) | |
| download | linux-0542972950ef26670a5696e43c0ea2b7b6ac96d4.tar.xz | |
Merge branch 'for-linus' into for-next
Pull 7.0 devel branch for further cleanups of ctxfi driver & co.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'tools/include/linux/args.h')
| -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 */ |