Module Name: src
Committed By: snj
Date: Tue Jun 23 07:08:23 UTC 2009
Modified Files:
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/i915drm/Makefile: revision 1.5
sys/modules/radeondrm/Makefile: revision 1.7
add a couple of missing files. pointed out by tron.
To generate a diff of this commit:
cvs rdiff -u -r1.3.6.1 -r1.3.6.2 src/sys/modules/i915drm/Makefile
cvs rdiff -u -r1.5.4.1 -r1.5.4.2 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/i915drm/Makefile
diff -u src/sys/modules/i915drm/Makefile:1.3.6.1 src/sys/modules/i915drm/Makefile:1.3.6.2
--- src/sys/modules/i915drm/Makefile:1.3.6.1 Tue Jun 23 07:07:28 2009
+++ src/sys/modules/i915drm/Makefile Tue Jun 23 07:08:23 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3.6.1 2009/06/23 07:07:28 snj Exp $
+# $NetBSD: Makefile,v 1.3.6.2 2009/06/23 07:08:23 snj Exp $
.include "../Makefile.inc"
@@ -7,10 +7,11 @@
KMOD= i915drm
-SRCS= i915_dma.c
-SRCS+= i915_drv.c
+SRCS= i915_drv.c
+SRCS+= i915_dma.c
SRCS+= i915_irq.c
SRCS+= i915_mem.c
+SRCS+= i915_suspend.c
CPPFLAGS+= -I${S}/external/bsd/drm/dist/bsd-core \
-I${S}/external/bsd/drm/dist/shared-core
Index: src/sys/modules/radeondrm/Makefile
diff -u src/sys/modules/radeondrm/Makefile:1.5.4.1 src/sys/modules/radeondrm/Makefile:1.5.4.2
--- src/sys/modules/radeondrm/Makefile:1.5.4.1 Tue Jun 23 07:07:29 2009
+++ src/sys/modules/radeondrm/Makefile Tue Jun 23 07:08:23 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5.4.1 2009/06/23 07:07:29 snj Exp $
+# $NetBSD: Makefile,v 1.5.4.2 2009/06/23 07:08:23 snj Exp $
.include "../Makefile.inc"
@@ -7,10 +7,12 @@
KMOD= radeondrm
-SRCS= ati_pcigart.c
+SRCS= radeon_drv.c
+# XXX this one should be in a sub-driver to share with r128drm
+SRCS+= ati_pcigart.c
SRCS+= r300_cmdbuf.c
+SRCS+= r600_cp.c
SRCS+= radeon_cp.c
-SRCS+= radeon_drv.c
SRCS+= radeon_irq.c
SRCS+= radeon_mem.c
SRCS+= radeon_state.c
