Module Name: src
Committed By: riastradh
Date: Wed Jan 29 19:46:51 UTC 2014
Modified Files:
src/sys/arch/amd64/conf [riastradh-drm2]: NO_DRM
Log Message:
Include genfb in NO_DRM kernel rather than modularizing.
Modularizing required a bunch of hacks (wscons/genfb/&c. is not ready
for modules) and failed to pull in rasops dependencies, so rasops
never worked correctly.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/arch/amd64/conf/NO_DRM
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/amd64/conf/NO_DRM
diff -u src/sys/arch/amd64/conf/NO_DRM:1.1.2.1 src/sys/arch/amd64/conf/NO_DRM:1.1.2.2
--- src/sys/arch/amd64/conf/NO_DRM:1.1.2.1 Wed Jul 24 03:53:14 2013
+++ src/sys/arch/amd64/conf/NO_DRM Wed Jan 29 19:46:51 2014
@@ -1,4 +1,4 @@
-# $NetBSD: NO_DRM,v 1.1.2.1 2013/07/24 03:53:14 riastradh Exp $
+# $NetBSD: NO_DRM,v 1.1.2.2 2014/01/29 19:46:51 riastradh Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.1.2.1 $"
+#ident "GENERIC-$Revision: 1.1.2.2 $"
maxusers 64 # estimated number of users
@@ -376,7 +376,7 @@ pms* at pckbc? # PS/2 mouse for wsmous
options PMS_SYNAPTICS_TOUCHPAD # Enable support for Synaptics Touchpads
options PMS_ELANTECH_TOUCHPAD # Enable support for Elantech Touchpads
#vga* at pci? dev ? function ?
-#genfb* at pci? dev ? function ?
+genfb* at pci? dev ? function ?
options VCONS_DRAW_INTR
#wsdisplay* at vga? console ?
wsdisplay* at wsemuldisplaydev?
