From 943ab0fa32882ea572aae81834098189a96deeef Mon Sep 17 00:00:00 2001 From: jsg Date: Tue, 23 Jan 2024 03:31:45 +0000 Subject: [PATCH] move CONCATENATE() to args.h to match linux --- sys/dev/pci/drm/include/linux/args.h | 8 ++++++++ sys/dev/pci/drm/include/linux/kernel.h | 2 -- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/sys/dev/pci/drm/include/linux/args.h b/sys/dev/pci/drm/include/linux/args.h index e69de29bb2d..674d7f0a64c 100644 --- a/sys/dev/pci/drm/include/linux/args.h +++ b/sys/dev/pci/drm/include/linux/args.h @@ -0,0 +1,8 @@ +/* Public domain. */ + +#ifndef _LINUX_ARGS_H +#define _LINUX_ARGS_H + +#define CONCATENATE(x, y) __CONCAT(x, y) + +#endif diff --git a/sys/dev/pci/drm/include/linux/kernel.h b/sys/dev/pci/drm/include/linux/kernel.h index 99767b82f0e..cc2c70edabc 100644 --- a/sys/dev/pci/drm/include/linux/kernel.h +++ b/sys/dev/pci/drm/include/linux/kernel.h @@ -155,8 +155,6 @@ _in_dbg_master(void) #define STUB() do { printf("%s: stub\n", __func__); } while(0) -#define CONCATENATE(x, y) __CONCAT(x, y) - #define PTR_IF(c, p) ((c) ? (p) : NULL) #endif -- 2.20.1