Wed Jul 24 02:33:45 2013 UTC ()
Unhook drm_platform.c; we have a different idea of platform devices.


(riastradh)
diff -r1.1.2.16 -r1.1.2.17 src/sys/modules/drm2/Makefile
cvs diff -r1.1.2.16 -r1.1.2.17 src/sys/modules/drm2/Attic/Makefile (expand / switch to unified diff)

--- src/sys/modules/drm2/Attic/Makefile 2013/07/24 02:33:31 1.1.2.16
+++ src/sys/modules/drm2/Attic/Makefile 2013/07/24 02:33:45 1.1.2.17
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.1.2.16 2013/07/24 02:33:31 riastradh Exp $ 1# $NetBSD: Makefile,v 1.1.2.17 2013/07/24 02:33:45 riastradh Exp $
2 2
3.include "../Makefile.inc" 3.include "../Makefile.inc"
4 4
5.PATH: ${S}/external/bsd/drm2/drm 5.PATH: ${S}/external/bsd/drm2/drm
6.PATH: ${S}/external/bsd/drm2/linux 6.PATH: ${S}/external/bsd/drm2/linux
7.PATH: ${S}/external/bsd/drm2/dist/drm 7.PATH: ${S}/external/bsd/drm2/dist/drm
8 8
9KMOD= drm2 9KMOD= drm2
10 10
11#SRCS+= ati_pcigart.c # XXX Restore for ATI support. 11#SRCS+= ati_pcigart.c # XXX Restore for ATI support.
12SRCS+= drm_agpsupport.c 12SRCS+= drm_agpsupport.c
13SRCS+= drm_auth.c 13SRCS+= drm_auth.c
14SRCS+= drm_buffer.c 14SRCS+= drm_buffer.c
@@ -26,27 +26,27 @@ SRCS+= drm_drv.c @@ -26,27 +26,27 @@ SRCS+= drm_drv.c
26SRCS+= drm_fops.c 26SRCS+= drm_fops.c
27#SRCS+= drm_gem.c # XXX Rewrite for uvm and stuff. 27#SRCS+= drm_gem.c # XXX Rewrite for uvm and stuff.
28SRCS+= drm_global.c 28SRCS+= drm_global.c
29SRCS+= drm_hashtab.c 29SRCS+= drm_hashtab.c
30#SRCS+= drm_info.c # XXX Rewrite for sysctl or something. 30#SRCS+= drm_info.c # XXX Rewrite for sysctl or something.
31#SRCS+= drm_ioc32.c 31#SRCS+= drm_ioc32.c
32SRCS+= drm_ioctl.c 32SRCS+= drm_ioctl.c
33SRCS+= drm_irq.c 33SRCS+= drm_irq.c
34SRCS+= drm_lock.c 34SRCS+= drm_lock.c
35SRCS+= drm_memory.c 35SRCS+= drm_memory.c
36SRCS+= drm_mm.c 36SRCS+= drm_mm.c
37#SRCS+= drm_modes.c # XXX Rewrite if necessary. 37#SRCS+= drm_modes.c # XXX Rewrite if necessary.
38SRCS+= drm_pci.c 38SRCS+= drm_pci.c
39SRCS+= drm_platform.c 39#SRCS+= drm_platform.c # XXX Rewrite per platform.
40SRCS+= drm_prime.c 40SRCS+= drm_prime.c
41SRCS+= drm_proc.c 41SRCS+= drm_proc.c
42SRCS+= drm_scatter.c 42SRCS+= drm_scatter.c
43SRCS+= drm_stub.c 43SRCS+= drm_stub.c
44SRCS+= drm_vm.c 44SRCS+= drm_vm.c
45 45
46SRCS+= linux_idr.c 46SRCS+= linux_idr.c
47 47
48CPPFLAGS+= -I${S}/external/bsd/drm2/include 48CPPFLAGS+= -I${S}/external/bsd/drm2/include
49CPPFLAGS+= -I${S}/external/bsd/drm2/dist/uapi 49CPPFLAGS+= -I${S}/external/bsd/drm2/dist/uapi
50CPPFLAGS+= -I${S}/external/bsd/drm2/dist/include 50CPPFLAGS+= -I${S}/external/bsd/drm2/dist/include
51CPPFLAGS+= -D__KERNEL__ 51CPPFLAGS+= -D__KERNEL__
52 52