diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2009-06-14 01:01:40 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2009-06-14 01:01:40 +0000 |
| commit | 54db1248b158c59e9f2586f158b4f7a03bd772b1 (patch) | |
| tree | 49b85777cc5cb6e2db1f8379315f0371921904b3 /sys/arch | |
| parent | 60209ff128ca8e8164d2ece1a0c77a081afbfd78 (diff) | |
Disable inteldrm by default since it once again breaks x40 suspend.
oga was warned; it is a minimum requirement for inteldrm to be on.
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index d293a9dcf05..e573dbc8165 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.664 2009/06/06 03:20:57 deraadt Exp $ +# $OpenBSD: GENERIC,v 1.665 2009/06/14 01:01:39 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? # Intel i915, i945 DRM driver +inteldrm* at vga? disable # Intel i915, i945 DRM driver drm* at inteldrm? #machdrm* at vga? # mach64 (3D Rage Pro, Rage) DRM driver #drm* at machdrm? |