Module Name: src
Committed By: riastradh
Date: Thu Jan 30 16:49:33 UTC 2014
Modified Files:
src/sys/dev/wsfb [riastradh-drm2]: files.wsfb
src/sys/external/bsd/drm2/conf [riastradh-drm2]: files.drm2
Log Message:
Tweak genfb tweaks so they work.
To generate a diff of this commit:
cvs rdiff -u -r1.7.30.1 -r1.7.30.2 src/sys/dev/wsfb/files.wsfb
cvs rdiff -u -r1.1.2.6 -r1.1.2.7 src/sys/external/bsd/drm2/conf/files.drm2
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/wsfb/files.wsfb
diff -u src/sys/dev/wsfb/files.wsfb:1.7.30.1 src/sys/dev/wsfb/files.wsfb:1.7.30.2
--- src/sys/dev/wsfb/files.wsfb:1.7.30.1 Wed Jan 29 19:47:38 2014
+++ src/sys/dev/wsfb/files.wsfb Thu Jan 30 16:49:33 2014
@@ -1,4 +1,4 @@
-# $NetBSD: files.wsfb,v 1.7.30.1 2014/01/29 19:47:38 riastradh Exp $
+# $NetBSD: files.wsfb,v 1.7.30.2 2014/01/30 16:49:33 riastradh Exp $
#
# wsdisplay framebuffer drivers
@@ -9,7 +9,7 @@ defflag opt_wsfb.h WSFB_FAKE_VGA_FB # al
defflag opt_wsfb.h WSFB_ALLOW_OTHERS # allow to mmap() foreign ranges
# a generic framebuffer console
-define genfbbase: rasops1, rasops2, rasops8, rasops15, rasops16, rasops24, rasops32, vcons
-device genfb: genfbbase, wsemuldisplaydev, drm
-file dev/wsfb/genfb.c genfbbase needs-flag
+define genfb: rasops1, rasops2, rasops8, rasops15, rasops16, rasops24, rasops32, vcons
+device genfb: genfb, wsemuldisplaydev, drm
+file dev/wsfb/genfb.c genfb needs-flag
defflag opt_genfb.h GENFB_DEBUG GENFB_SHADOWFB
Index: src/sys/external/bsd/drm2/conf/files.drm2
diff -u src/sys/external/bsd/drm2/conf/files.drm2:1.1.2.6 src/sys/external/bsd/drm2/conf/files.drm2:1.1.2.7
--- src/sys/external/bsd/drm2/conf/files.drm2:1.1.2.6 Wed Jan 29 19:47:38 2014
+++ src/sys/external/bsd/drm2/conf/files.drm2 Thu Jan 30 16:49:33 2014
@@ -1,4 +1,4 @@
-# $NetBSD: files.drm2,v 1.1.2.6 2014/01/29 19:47:38 riastradh Exp $
+# $NetBSD: files.drm2,v 1.1.2.7 2014/01/30 16:49:33 riastradh Exp $
define drmkmsbus { }
@@ -69,7 +69,7 @@ file external/bsd/drm2/drm/drm_gem_vm.c
file external/bsd/drm2/drm/drm_module.c drmkms
file external/bsd/drm2/drm/drm_sysfs.c drmkms
-device i915drmkms: drmkms, drmkmsbus, genfbbase, wsemuldisplaydev
+device i915drmkms: drmkms, drmkmsbus, genfb, wsemuldisplaydev
attach i915drmkms at pci
makeoptions i915drmkms CPPFLAGS+="-I$S/external/bsd/drm2/dist/drm/i915"
