From 579dbc3bf5f7468ef2a836cc991a11ddb31bec01 Mon Sep 17 00:00:00 2001 From: riastradh Date: Tue, 1 Apr 2014 15:08:58 +0000 Subject: [PATCH] Make drmkms find header files from sys/external/bsd/common. --- sys/external/bsd/drm2/drm/files.drmkms | 3 ++- sys/external/bsd/drm2/linux/files.drmkms_linux | 3 ++- sys/modules/drmkms/Makefile.inc | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/external/bsd/drm2/drm/files.drmkms b/sys/external/bsd/drm2/drm/files.drmkms index f0cee42935a2..3f8b09c0d8dc 100644 --- a/sys/external/bsd/drm2/drm/files.drmkms +++ b/sys/external/bsd/drm2/drm/files.drmkms @@ -1,4 +1,4 @@ -# $NetBSD: files.drmkms,v 1.4 2014/03/31 13:38:44 riastradh Exp $ +# $NetBSD: files.drmkms,v 1.5 2014/04/01 15:08:58 riastradh Exp $ define drmkmsbus { } @@ -18,6 +18,7 @@ defflag opt_drmkms.h DRMKMS_DEBUG makeoptions drmkms CPPFLAGS+="-I$S/external/bsd/drm2/include" makeoptions drmkms CPPFLAGS+="-I$S/external/bsd/drm2/dist/uapi" makeoptions drmkms CPPFLAGS+="-I$S/external/bsd/drm2/dist/include" +makeoptions drmkms CPPFLAGS+="-I$S/external/bsd/common/include" makeoptions drmkms "CWARNFLAGS.drm_crtc.c"+="-Wno-shadow" makeoptions drmkms "CWARNFLAGS.drm_edid.c"+="-Wno-shadow" diff --git a/sys/external/bsd/drm2/linux/files.drmkms_linux b/sys/external/bsd/drm2/linux/files.drmkms_linux index 8f6958d972f1..6090b29c5c5a 100644 --- a/sys/external/bsd/drm2/linux/files.drmkms_linux +++ b/sys/external/bsd/drm2/linux/files.drmkms_linux @@ -1,8 +1,9 @@ -# $NetBSD: files.drmkms_linux,v 1.3 2014/03/31 13:38:44 riastradh Exp $ +# $NetBSD: files.drmkms_linux,v 1.4 2014/04/01 15:08:58 riastradh Exp $ define drmkms_linux: i2cexec, i2c_bitbang makeoptions drmkms_linux CPPFLAGS+="-I$S/external/bsd/drm2/include" +makeoptions drmkms_linux CPPFLAGS+="-I$S/external/bsd/common/include" file external/bsd/drm2/linux/linux_gfp.c drmkms_linux file external/bsd/drm2/linux/linux_kmap.c drmkms_linux diff --git a/sys/modules/drmkms/Makefile.inc b/sys/modules/drmkms/Makefile.inc index 9d1102283d17..079f534d6317 100644 --- a/sys/modules/drmkms/Makefile.inc +++ b/sys/modules/drmkms/Makefile.inc @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.2 2014/03/18 18:20:43 riastradh Exp $ +# $NetBSD: Makefile.inc,v 1.3 2014/04/01 15:08:58 riastradh Exp $ # Common makefile cruft for drm2 code. @@ -8,6 +8,7 @@ CPPFLAGS+= -I${S}/external/bsd/drm2/include CPPFLAGS+= -I${S}/external/bsd/drm2/dist/uapi CPPFLAGS+= -I${S}/external/bsd/drm2/dist/include +CPPFLAGS+= -I${S}/external/bsd/common/include CPPFLAGS+= -D__KERNEL__ # XXX Is this the right place to set this?