From db5f6db1d3e912dd792a8013b5825b3922088bfe Mon Sep 17 00:00:00 2001
From: Owain Ainsworth <oga@cvs.openbsd.org>
Date: Tue, 27 May 2008 19:45:30 +0000
Subject: Since the vtophys stuff was nuked, drm now works on amd64 too. Add
 the relavent config goo.

DRM_NO_MTRR is still needed on amd64 since the mtrr apis differ between
it and i386.

ok kettenis@.
---
 sys/arch/amd64/conf/GENERIC | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'sys/arch/amd64/conf')

diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index e2de92acf80..6d8113af67c 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.230 2008/05/23 15:39:43 jasper Exp $
+#	$OpenBSD: GENERIC,v 1.231 2008/05/27 19:45:29 oga Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -567,3 +567,14 @@ pseudo-device	hotplug		1	# devices hot plugging
 # mouse & keyboard multiplexor pseudo-devices
 pseudo-device	wsmux		2
 pseudo-device	crypto		1
+
+# DRM: direct rendering modules
+#option		DRM_DEBUG
+#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?		# ATI Radeon DRM driver
+#savagedrm*	at vga?		# S3 Savage DRM driver
+#sisdrm*	at vga?		# SiS DRM driver
+#tdfxdrm*	at vga?		# 3dfx (voodoo) DRM driver
-- 
cgit v1.2.3