Wed Jul 24 02:58:40 2013 UTC ()
Hook drm_edid.c back into the drm2 module build.

drm2.kmod now has no more undefined drm_* symbols!


(riastradh)
diff -r1.1.2.33 -r1.1.2.34 src/sys/modules/drm2/Makefile

cvs diff -r1.1.2.33 -r1.1.2.34 src/sys/modules/drm2/Attic/Makefile (expand / switch to unified diff)

--- src/sys/modules/drm2/Attic/Makefile 2013/07/24 02:55:48 1.1.2.33
+++ src/sys/modules/drm2/Attic/Makefile 2013/07/24 02:58:40 1.1.2.34
@@ -1,39 +1,39 @@ @@ -1,39 +1,39 @@
1# $NetBSD: Makefile,v 1.1.2.33 2013/07/24 02:55:48 riastradh Exp $ 1# $NetBSD: Makefile,v 1.1.2.34 2013/07/24 02:58:40 riastradh Exp $
2 2
3.include "../Makefile.inc" 3.include "../Makefile.inc"
4.include "Makefile.inc" 4.include "Makefile.inc"
5 5
6.PATH: ${S}/external/bsd/drm2/drm 6.PATH: ${S}/external/bsd/drm2/drm
7.PATH: ${S}/external/bsd/drm2/pci 7.PATH: ${S}/external/bsd/drm2/pci
8.PATH: ${S}/external/bsd/drm2/linux 8.PATH: ${S}/external/bsd/drm2/linux
9.PATH: ${S}/external/bsd/drm2/dist/drm 9.PATH: ${S}/external/bsd/drm2/dist/drm
10 10
11KMOD= drm2 11KMOD= drm2
12IOCONF= drm.ioconf 12IOCONF= drm.ioconf
13 13
14#SRCS+= ati_pcigart.c # XXX Restore for ATI support. 14#SRCS+= ati_pcigart.c # XXX Restore for ATI support.
15SRCS+= drm_agpsupport.c # XXX Move to drm2pci module later. 15SRCS+= drm_agpsupport.c # XXX Move to drm2pci module later.
16SRCS+= drm_auth.c 16SRCS+= drm_auth.c
17SRCS+= drm_buffer.c 17SRCS+= drm_buffer.c
18SRCS+= drm_bufs.c 18SRCS+= drm_bufs.c
19#SRCS+= drm_cache.c # XXX Rewrite for uvm. 19#SRCS+= drm_cache.c # XXX Rewrite for uvm.
20SRCS+= drm_context.c 20SRCS+= drm_context.c
21SRCS+= drm_crtc.c 21SRCS+= drm_crtc.c
22SRCS+= drm_crtc_helper.c 22SRCS+= drm_crtc_helper.c
23SRCS+= drm_dma.c 23SRCS+= drm_dma.c
24#SRCS+= drm_dp_helper.c # XXX Rewrite for i2c. 24#SRCS+= drm_dp_helper.c # XXX Rewrite for i2c.
25SRCS+= drm_drv.c 25SRCS+= drm_drv.c
26#SRCS+= drm_edid.c # XXX Rewrite for NetBSD edid. 26SRCS+= drm_edid.c
27#SRCS+= drm_encoder_slave.c # XXX Rewrite for i2c. 27#SRCS+= drm_encoder_slave.c # XXX Rewrite for i2c.
28#SRCS+= drm_fb_helper.c # XXX Rewrite for wsconsole. 28#SRCS+= drm_fb_helper.c # XXX Rewrite for wsconsole.
29SRCS+= drm_fops.c 29SRCS+= drm_fops.c
30SRCS+= drm_gem.c 30SRCS+= drm_gem.c
31SRCS+= drm_global.c 31SRCS+= drm_global.c
32SRCS+= drm_hashtab.c 32SRCS+= drm_hashtab.c
33#SRCS+= drm_info.c # XXX Rewrite for sysctl or something. 33#SRCS+= drm_info.c # XXX Rewrite for sysctl or something.
34#SRCS+= drm_ioc32.c 34#SRCS+= drm_ioc32.c
35SRCS+= drm_ioctl.c 35SRCS+= drm_ioctl.c
36SRCS+= drm_irq.c 36SRCS+= drm_irq.c
37SRCS+= drm_lock.c 37SRCS+= drm_lock.c
38SRCS+= drm_memory.c 38SRCS+= drm_memory.c
39SRCS+= drm_mm.c 39SRCS+= drm_mm.c