Mon Aug 27 06:39:51 2018 UTC ()
Fix radeon include order.


(riastradh)
diff -r1.16 -r1.17 src/sys/external/bsd/drm2/radeon/files.radeon
cvs diff -r1.16 -r1.17 src/sys/external/bsd/drm2/radeon/files.radeon (expand / switch to unified diff)

--- src/sys/external/bsd/drm2/radeon/files.radeon 2018/08/27 06:32:44 1.16
+++ src/sys/external/bsd/drm2/radeon/files.radeon 2018/08/27 06:39:51 1.17
@@ -1,28 +1,31 @@ @@ -1,28 +1,31 @@
1# $NetBSD: files.radeon,v 1.16 2018/08/27 06:32:44 riastradh Exp $ 1# $NetBSD: files.radeon,v 1.17 2018/08/27 06:39:51 riastradh Exp $
2 2
3define radeonfbbus { } 3define radeonfbbus { }
4device radeon: drmkms, drmkms_pci, drmkms_ttm, radeonfbbus, firmload 4device radeon: drmkms, drmkms_pci, drmkms_ttm, radeonfbbus, firmload
5attach radeon at pci 5attach radeon at pci
6 6
7# XXX Rename this to radeonfb when the legacy radeonfb(4) is gone. 7# XXX Rename this to radeonfb when the legacy radeonfb(4) is gone.
8device radeondrmkmsfb: radeonfbbus, genfb, wsemuldisplaydev 8device radeondrmkmsfb: radeonfbbus, genfb, wsemuldisplaydev
9attach radeondrmkmsfb at radeonfbbus 9attach radeondrmkmsfb at radeonfbbus
10 10
11makeoptions radeon CPPFLAGS+="-I$S/external/bsd/drm2/dist/drm/radeon" 11# Our overrides first.
12makeoptions radeon CPPFLAGS+="-I$S/external/bsd/drm2/dist/drm/amd/include" 
13makeoptions radeon CPPFLAGS+="-I$S/external/bsd/drm2/include/radeon" 12makeoptions radeon CPPFLAGS+="-I$S/external/bsd/drm2/include/radeon"
14makeoptions radeon CPPFLAGS+="-I$S/external/bsd/drm2/radeon" 13makeoptions radeon CPPFLAGS+="-I$S/external/bsd/drm2/radeon"
15 14
 15# Then their header files.
 16makeoptions radeon CPPFLAGS+="-I$S/external/bsd/drm2/dist/drm/amd/include"
 17makeoptions radeon CPPFLAGS+="-I$S/external/bsd/drm2/dist/drm/radeon"
 18
16makeoptions radeon "CWARNFLAGS.radeon"+="-Wno-missing-field-initializers" 19makeoptions radeon "CWARNFLAGS.radeon"+="-Wno-missing-field-initializers"
17makeoptions radeon "CWARNFLAGS.radeon"+="-Wno-missing-prototypes" 20makeoptions radeon "CWARNFLAGS.radeon"+="-Wno-missing-prototypes"
18makeoptions radeon "CWARNFLAGS.radeon"+="-Wno-shadow" 21makeoptions radeon "CWARNFLAGS.radeon"+="-Wno-shadow"
19makeoptions radeon "CWARNFLAGS.radeon"+="-Wno-unused-const-variable" 22makeoptions radeon "CWARNFLAGS.radeon"+="-Wno-unused-const-variable"
20 23
21file external/bsd/drm2/radeon/radeon_module.c radeon 24file external/bsd/drm2/radeon/radeon_module.c radeon
22file external/bsd/drm2/radeon/radeon_pci.c radeon 25file external/bsd/drm2/radeon/radeon_pci.c radeon
23 26
24file external/bsd/drm2/radeon/radeondrmkmsfb.c radeondrmkmsfb 27file external/bsd/drm2/radeon/radeondrmkmsfb.c radeondrmkmsfb
25 28
26file external/bsd/drm2/dist/drm/radeon/atom.c radeon 29file external/bsd/drm2/dist/drm/radeon/atom.c radeon
27file external/bsd/drm2/dist/drm/radeon/atombios_crtc.c radeon 30file external/bsd/drm2/dist/drm/radeon/atombios_crtc.c radeon
28file external/bsd/drm2/dist/drm/radeon/atombios_dp.c radeon 31file external/bsd/drm2/dist/drm/radeon/atombios_dp.c radeon