summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2009-06-25 14:22:59 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2009-06-25 14:22:59 +0000
commit5a4d0eba796e3343b958375f6dda2eb33bc8a5c3 (patch)
treef2bc93202bc65a34082bab3d4baeb0ff8b1feec8 /sys
parenteec502fb37e013a324c9d4d2f2d87d6aedf4bce9 (diff)
re-enable inteldrm since new X driver is about to fix the issue
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/i386/conf/GENERIC4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index e573dbc8165..089e6f9f072 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.665 2009/06/14 01:01:39 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.666 2009/06/25 14:22:58 deraadt Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -364,7 +364,7 @@ agp* at sisagp? # AGP bridges
agp* at viaagp? # AGP bridges
#option DRM_DEBUG
-inteldrm* at vga? disable # Intel i915, i945 DRM driver
+inteldrm* at vga? # Intel i915, i945 DRM driver
drm* at inteldrm?
#machdrm* at vga? # mach64 (3D Rage Pro, Rage) DRM driver
#drm* at machdrm?