Module Name: src
Committed By: riastradh
Date: Mon Aug 27 06:39:51 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/radeon: files.radeon
Log Message:
Fix radeon include order.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/external/bsd/drm2/radeon/files.radeon
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/radeon/files.radeon
diff -u src/sys/external/bsd/drm2/radeon/files.radeon:1.16 src/sys/external/bsd/drm2/radeon/files.radeon:1.17
--- src/sys/external/bsd/drm2/radeon/files.radeon:1.16 Mon Aug 27 06:32:44 2018
+++ src/sys/external/bsd/drm2/radeon/files.radeon Mon Aug 27 06:39:51 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.radeon,v 1.16 2018/08/27 06:32:44 riastradh Exp $
+# $NetBSD: files.radeon,v 1.17 2018/08/27 06:39:51 riastradh Exp $
define radeonfbbus { }
device radeon: drmkms, drmkms_pci, drmkms_ttm, radeonfbbus, firmload
@@ -8,11 +8,14 @@ attach radeon at pci
device radeondrmkmsfb: radeonfbbus, genfb, wsemuldisplaydev
attach radeondrmkmsfb at radeonfbbus
-makeoptions radeon CPPFLAGS+="-I$S/external/bsd/drm2/dist/drm/radeon"
-makeoptions radeon CPPFLAGS+="-I$S/external/bsd/drm2/dist/drm/amd/include"
+# Our overrides first.
makeoptions radeon CPPFLAGS+="-I$S/external/bsd/drm2/include/radeon"
makeoptions radeon CPPFLAGS+="-I$S/external/bsd/drm2/radeon"
+# Then their header files.
+makeoptions radeon CPPFLAGS+="-I$S/external/bsd/drm2/dist/drm/amd/include"
+makeoptions radeon CPPFLAGS+="-I$S/external/bsd/drm2/dist/drm/radeon"
+
makeoptions radeon "CWARNFLAGS.radeon"+="-Wno-missing-field-initializers"
makeoptions radeon "CWARNFLAGS.radeon"+="-Wno-missing-prototypes"
makeoptions radeon "CWARNFLAGS.radeon"+="-Wno-shadow"
