Module Name: src
Committed By: riastradh
Date: Wed Apr 29 11:37:31 UTC 2015
Modified Files:
src/sys/arch/i386/conf: ALL
src/sys/external/bsd/drm2/pci: files.drmkms_pci
Log Message:
Hook up viadrmums and include it it i386/ALL.
To generate a diff of this commit:
cvs rdiff -u -r1.392 -r1.393 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/drm2/pci/files.drmkms_pci
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.392 src/sys/arch/i386/conf/ALL:1.393
--- src/sys/arch/i386/conf/ALL:1.392 Tue Apr 28 13:52:50 2015
+++ src/sys/arch/i386/conf/ALL Wed Apr 29 11:37:31 2015
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.392 2015/04/28 13:52:50 rjs Exp $
+# $NetBSD: ALL,v 1.393 2015/04/29 11:37:31 riastradh Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.392 $"
+#ident "ALL-$Revision: 1.393 $"
maxusers 64 # estimated number of users
@@ -604,6 +604,7 @@ wsdisplay* at wsemuldisplaydev?
#vboxdrm* at drm? # VirtualBox DRM driver
#viadrm* at drm? # VIA UniChrome DRM driver
+# DRMKMS drivers
i915drmkms* at pci? dev ? function ?
intelfb* at intelfbbus?
@@ -613,6 +614,9 @@ radeondrmkmsfb* at radeonfbbus?
#nouveau* at pci? dev ? function ?
#nouveaufb* at nouveaufbbus
+# DRMUMS drivers
+viadrmums* at drm?
+
attimer0 at isa?
pcppi0 at isa?
sysbeep0 at pcppi?
Index: src/sys/external/bsd/drm2/pci/files.drmkms_pci
diff -u src/sys/external/bsd/drm2/pci/files.drmkms_pci:1.7 src/sys/external/bsd/drm2/pci/files.drmkms_pci:1.8
--- src/sys/external/bsd/drm2/pci/files.drmkms_pci:1.7 Wed Apr 29 11:28:32 2015
+++ src/sys/external/bsd/drm2/pci/files.drmkms_pci Wed Apr 29 11:37:31 2015
@@ -1,4 +1,4 @@
-# $NetBSD: files.drmkms_pci,v 1.7 2015/04/29 11:28:32 riastradh Exp $
+# $NetBSD: files.drmkms_pci,v 1.8 2015/04/29 11:37:31 riastradh Exp $
# Attribute for kernel components supporting PCI-based real graphics
# drivers, a.k.a. `KMS' (kernel mode-setting), as opposed to the legacy
@@ -20,4 +20,4 @@ file external/bsd/drm2/pci/drmfb_pci.c
include "external/bsd/drm2/i915drm/files.i915drmkms"
include "external/bsd/drm2/radeon/files.radeon"
include "external/bsd/drm2/nouveau/files.nouveau"
-#include "external/bsd/drm2/via/files.via"
+include "external/bsd/drm2/via/files.via"
