Module Name: src
Committed By: riastradh
Date: Sun Dec 19 00:27:52 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/drm: files.drmkms
Log Message:
No more hacks for dist/uapi -- got moved to dist/include/uapi.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/external/bsd/drm2/drm/files.drmkms
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/drm/files.drmkms
diff -u src/sys/external/bsd/drm2/drm/files.drmkms:1.39 src/sys/external/bsd/drm2/drm/files.drmkms:1.40
--- src/sys/external/bsd/drm2/drm/files.drmkms:1.39 Sun Dec 19 00:26:16 2021
+++ src/sys/external/bsd/drm2/drm/files.drmkms Sun Dec 19 00:27:52 2021
@@ -1,4 +1,4 @@
-# $NetBSD: files.drmkms,v 1.39 2021/12/19 00:26:16 riastradh Exp $
+# $NetBSD: files.drmkms,v 1.40 2021/12/19 00:27:52 riastradh Exp $
include "external/bsd/drm2/linux/files.drmkms_linux"
@@ -25,13 +25,7 @@ makeoptions drmkms CPPFLAGS+="-I$S/exte
# Then upstream.
makeoptions drmkms CPPFLAGS+="-I$S/external/bsd/drm2/dist/include"
makeoptions drmkms CPPFLAGS+="-I$S/external/bsd/drm2/dist/include/drm"
-makeoptions drmkms CPPFLAGS+="-I$S/external/bsd/drm2/dist/uapi"
-
-# Must come last because some header file names are repeated in
-# dist/drm (I'm looking ta you, drm_legacy.h), while others sometimes
-# explicitly write <uapi/...>. (Maybe that should have been imported
-# under dist/include/uapi rather than dist/uapi.)
-makeoptions drmkms CPPFLAGS+="-I$S/external/bsd/drm2/dist"
+makeoptions drmkms CPPFLAGS+="-I$S/external/bsd/drm2/dist/include/uapi"
# XXX Should probably be in a header file. opt_drmkms.h?
makeoptions drmkms CPPFLAGS+="-D__KERNEL__"
