summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormatthieu <matthieu@openbsd.org>2011-09-20 20:25:45 +0000
committermatthieu <matthieu@openbsd.org>2011-09-20 20:25:45 +0000
commit6557a04f3374ca978987276d2ae948f363ce6501 (patch)
tree6888d06096ec2f90f7f8941201e4433d5662ff5b
parentDon't include fcntl.h (not needed anymore) and use errx(3) instead of (diff)
downloadwireguard-openbsd-6557a04f3374ca978987276d2ae948f363ce6501.tar.xz
wireguard-openbsd-6557a04f3374ca978987276d2ae948f363ce6501.zip
Remove commented-out leftovers from old drm drivers that have been removed
from tree. ok oga@
-rw-r--r--sys/arch/amd64/conf/GENERIC14
-rw-r--r--sys/arch/i386/conf/GENERIC14
2 files changed, 2 insertions, 26 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index d8f0adcbe34..e5f8836642a 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.325 2011/08/02 00:53:48 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.326 2011/09/20 20:25:45 matthieu Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -299,20 +299,8 @@ agp* at intagp?
#option DRM_DEBUG
inteldrm* at vga? # Intel i915, i945 DRM driver
drm* at inteldrm?
-#machdrm* at vga? # mach64 (3D Rage Pro, Rage) DRM driver
-#drm* at machdrm?
-#mgadrm* at vga? # Matrox G[24]00, G[45]50 DRM driver
-#drm* at mgadrm?
-#ragedrm* at vga? # ATI Rage 128 DRM driver
-#drm* at ragedrm?
radeondrm* at vga? # ATI Radeon DRM driver
drm* at radeondrm?
-#savagedrm* at vga? # S3 Savage DRM driver
-#drm* at savagedrm?
-#sisdrm* at vga? # SiS DRM driver
-#drm* at sisdrm?
-#tdfxdrm* at vga? # 3dfx (voodoo) DRM driver
-#drm* at tdfxdrm?
pcppi0 at isa?
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 3619eda2bd2..bce118a87fe 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.727 2011/08/02 00:53:47 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.728 2011/09/20 20:25:45 matthieu Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -369,20 +369,8 @@ agp* at viaagp? # AGP bridges
#option DRMDEBUG
inteldrm* at vga? # Intel i915, i945 DRM driver
drm* at inteldrm?
-#machdrm* at vga? # mach64 (3D Rage Pro, Rage) DRM driver
-#drm* at machdrm?
-#mgadrm* at vga? # Matrox G[24]00, G[45]50 DRM driver
-#drm* at mgadrm?
-#ragedrm* at vga? # ATI Rage 128 DRM driver
-#drm* at ragedrm?
radeondrm* at vga? # ATI Radeon DRM driver
drm* at radeondrm?
-#savagedrm* at vga? # S3 Savage DRM driver
-#drm* at savagedrm?
-#sisdrm* at vga? # SiS DRM driver
-#drm* at sisdrm?
-#tdfxdrm* at vga? # 3dfx (voodoo) DRM driver
-#drm* at tdfxdrm?
#option VESABIOSVERBOSE
#option VESAFB # VESA bios framebuffer support for X11