Module Name: src
Committed By: riastradh
Date: Tue Apr 1 15:08:58 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/drm: files.drmkms
src/sys/external/bsd/drm2/linux: files.drmkms_linux
src/sys/modules/drmkms: Makefile.inc
Log Message:
Make drmkms find header files from sys/external/bsd/common.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/drm/files.drmkms
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/linux/files.drmkms_linux
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/drmkms/Makefile.inc
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.4 src/sys/external/bsd/drm2/drm/files.drmkms:1.5
--- src/sys/external/bsd/drm2/drm/files.drmkms:1.4 Mon Mar 31 13:38:44 2014
+++ src/sys/external/bsd/drm2/drm/files.drmkms Tue Apr 1 15:08:58 2014
@@ -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"
Index: src/sys/external/bsd/drm2/linux/files.drmkms_linux
diff -u src/sys/external/bsd/drm2/linux/files.drmkms_linux:1.3 src/sys/external/bsd/drm2/linux/files.drmkms_linux:1.4
--- src/sys/external/bsd/drm2/linux/files.drmkms_linux:1.3 Mon Mar 31 13:38:44 2014
+++ src/sys/external/bsd/drm2/linux/files.drmkms_linux Tue Apr 1 15:08:58 2014
@@ -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
Index: src/sys/modules/drmkms/Makefile.inc
diff -u src/sys/modules/drmkms/Makefile.inc:1.2 src/sys/modules/drmkms/Makefile.inc:1.3
--- src/sys/modules/drmkms/Makefile.inc:1.2 Tue Mar 18 18:20:43 2014
+++ src/sys/modules/drmkms/Makefile.inc Tue Apr 1 15:08:58 2014
@@ -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?
