summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorOwain Ainsworth <oga@cvs.openbsd.org>2008-10-15 15:05:05 +0000
committerOwain Ainsworth <oga@cvs.openbsd.org>2008-10-15 15:05:05 +0000
commitb302a033156f300c77b20b1eb011b4ceaccff009 (patch)
tree337b2788bfa8703cb2b36bd4bda79e4d51fe9895 /sys
parentc764f4f4bb63b00f9d7d202cfe41ed20a827d721 (diff)
inteldrm and radeondrm are pretty stable by this point, so enable them on amd64
and i386. deraadt got sick of me wussing out over this.
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/amd64/conf/GENERIC6
-rw-r--r--sys/arch/i386/conf/GENERIC6
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 0e9ed45e316..6504369902c 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.242 2008/10/08 00:19:36 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.243 2008/10/15 15:05:04 oga Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -264,11 +264,11 @@ wsmouse* at pmsi? mux 0
agp* at vga? # AGP bridge
#option DRM_DEBUG
-inteldrm* at vga? disable # Intel i915, i945 DRM driver
+inteldrm* at vga? # Intel i915, i945 DRM driver
#machdrm* at vga? # mach64 (3D Rage Pro, Rage) DRM driver
#mgadrm* at vga? # Matrox G[24]00, G[45]50 DRM driver
#ragedrm* at vga? # ATI Rage 128 DRM driver
-radeondrm* at vga? disable # ATI Radeon DRM driver
+radeondrm* at vga? # ATI Radeon DRM driver
#savagedrm* at vga? # S3 Savage DRM driver
#sisdrm* at vga? # SiS DRM driver
#tdfxdrm* at vga? # 3dfx (voodoo) DRM driver
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 4030e1dcb97..2a1e40350fe 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.635 2008/10/08 00:19:34 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.636 2008/10/15 15:05:04 oga Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -331,11 +331,11 @@ wsmouse* at pmsi? mux 0
agp* at vga? # AGP bridges
#option DRM_DEBUG
-inteldrm* at vga? disable # Intel i915, i945 DRM driver
+inteldrm* at vga? # Intel i915, i945 DRM driver
#machdrm* at vga? # mach64 (3D Rage Pro, Rage) DRM driver
#mgadrm* at vga? # Matrox G[24]00, G[45]50 DRM driver
#ragedrm* at vga? # ATI Rage 128 DRM driver
-radeondrm* at vga? disable # ATI Radeon DRM driver
+radeondrm* at vga? # ATI Radeon DRM driver
#savagedrm* at vga? # S3 Savage DRM driver
#sisdrm* at vga? # SiS DRM driver
#tdfxdrm* at vga? # 3dfx (voodoo) DRM driver