Module Name: src Committed By: snj Date: Tue Jun 23 07:07:29 UTC 2009
Modified Files: src/sys/modules/drm [netbsd-5]: Makefile src/sys/modules/i915drm [netbsd-5]: Makefile src/sys/modules/radeondrm [netbsd-5]: Makefile Log Message: Pull up following revision(s) (requested by mrg in ticket #829): sys/modules/drm/Makefile: revision 1.3 sys/modules/i915drm/Makefile: revision 1.4 sys/modules/radeondrm/Makefile: revision 1.6 Fix modules build after update of drm(4). To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.2.14.1 src/sys/modules/drm/Makefile cvs rdiff -u -r1.3 -r1.3.6.1 src/sys/modules/i915drm/Makefile cvs rdiff -u -r1.5 -r1.5.4.1 src/sys/modules/radeondrm/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/modules/drm/Makefile diff -u src/sys/modules/drm/Makefile:1.2 src/sys/modules/drm/Makefile:1.2.14.1 --- src/sys/modules/drm/Makefile:1.2 Mon May 19 13:21:57 2008 +++ src/sys/modules/drm/Makefile Tue Jun 23 07:07:28 2009 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.2 2008/05/19 13:21:57 tnn Exp $ +# $NetBSD: Makefile,v 1.2.14.1 2009/06/23 07:07:28 snj Exp $ .include "../Makefile.inc" -.PATH: ${S}/dev/drm +.PATH: ${S}/external/bsd/drm/dist/bsd-core KMOD= drm @@ -23,4 +23,6 @@ SRCS+= drm_sysctl.c SRCS+= drm_vm.c +CPPFLAGS+= -I${S}/external/bsd/drm/dist/shared-core + .include <bsd.kmodule.mk> Index: src/sys/modules/i915drm/Makefile diff -u src/sys/modules/i915drm/Makefile:1.3 src/sys/modules/i915drm/Makefile:1.3.6.1 --- src/sys/modules/i915drm/Makefile:1.3 Tue Jul 8 10:11:02 2008 +++ src/sys/modules/i915drm/Makefile Tue Jun 23 07:07:28 2009 @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.3 2008/07/08 10:11:02 jmmv Exp $ +# $NetBSD: Makefile,v 1.3.6.1 2009/06/23 07:07:28 snj Exp $ .include "../Makefile.inc" -.PATH: ${S}/dev/pci/drm +.PATH: ${S}/external/bsd/drm/dist/bsd-core +.PATH: ${S}/external/bsd/drm/dist/shared-core KMOD= i915drm @@ -11,6 +12,7 @@ SRCS+= i915_irq.c SRCS+= i915_mem.c -CPPFLAGS+= -I${S}/dev/drm +CPPFLAGS+= -I${S}/external/bsd/drm/dist/bsd-core \ + -I${S}/external/bsd/drm/dist/shared-core .include <bsd.kmodule.mk> Index: src/sys/modules/radeondrm/Makefile diff -u src/sys/modules/radeondrm/Makefile:1.5 src/sys/modules/radeondrm/Makefile:1.5.4.1 --- src/sys/modules/radeondrm/Makefile:1.5 Wed Oct 15 14:09:21 2008 +++ src/sys/modules/radeondrm/Makefile Tue Jun 23 07:07:29 2009 @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.5 2008/10/15 14:09:21 pooka Exp $ +# $NetBSD: Makefile,v 1.5.4.1 2009/06/23 07:07:29 snj Exp $ .include "../Makefile.inc" -.PATH: ${S}/dev/pci/drm +.PATH: ${S}/external/bsd/drm/dist/bsd-core +.PATH: ${S}/external/bsd/drm/dist/shared-core KMOD= radeondrm @@ -14,6 +15,7 @@ SRCS+= radeon_mem.c SRCS+= radeon_state.c -CPPFLAGS+= -I${S}/dev/drm +CPPFLAGS+= -I${S}/external/bsd/drm/dist/bsd-core \ + -I${S}/external/bsd/drm/dist/shared-core .include <bsd.kmodule.mk>