diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2011-08-02 00:53:49 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2011-08-02 00:53:49 +0000 |
| commit | ad4585bab676d424428a965ef9c34ea02bad8817 (patch) | |
| tree | 36b9f050a59cced26d2e916567b1e38ea6463829 | |
| parent | 7199a7f4727521b2a32fc8ba3efa10bca2e97460 (diff) | |
disable mmuagp due to reports it breaks some machines.
oga has disappeared
| -rw-r--r-- | sys/arch/amd64/conf/GENERIC | 6 | ||||
| -rw-r--r-- | sys/arch/i386/conf/GENERIC | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC index 40f16b8bc31..d8f0adcbe34 100644 --- a/sys/arch/amd64/conf/GENERIC +++ b/sys/arch/amd64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.324 2011/07/07 23:41:09 tedu Exp $ +# $OpenBSD: GENERIC,v 1.325 2011/08/02 00:53:48 deraadt Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -291,10 +291,10 @@ wskbd* at pckbd? mux 1 wsmouse* at pms? mux 0 intagp* at vga? # intel integrated graphics -mmuagp* at pchb? # amd64 mmu agp. +#mmuagp* at pchb? # amd64 mmu agp. agp* at intagp? -agp* at mmuagp? +#agp* at mmuagp? #option DRM_DEBUG inteldrm* at vga? # Intel i915, i945 DRM driver diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index 8e313299179..3619eda2bd2 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.726 2011/07/07 23:36:41 tedu Exp $ +# $OpenBSD: GENERIC,v 1.727 2011/08/02 00:53:47 deraadt Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -356,7 +356,7 @@ amdagp* at pchb? intelagp* at pchb? sisagp* at pchb? viaagp* at pchb? -mmuagp* at pchb? +#mmuagp* at pchb? agp* at intagp? # AGP bridges agp* at aliagp? # AGP bridges @@ -364,7 +364,7 @@ agp* at amdagp? # AGP bridges agp* at intelagp? # AGP bridges agp* at sisagp? # AGP bridges agp* at viaagp? # AGP bridges -agp* at mmuagp? +#agp* at mmuagp? #option DRMDEBUG inteldrm* at vga? # Intel i915, i945 DRM driver |