compile inteldrm and radeondrm in GENERIC by default, but disabled.

This will let them get some more testing. Re-order things a little while
i'm here.

prompted by and ok deraadt@.

diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index 6790f4c..1902549 100644 (file)
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-#      $OpenBSD: GENERIC,v 1.239 2008/07/30 14:41:54 reyk Exp $
+#      $OpenBSD: GENERIC,v 1.240 2008/08/02 16:09:29 oga Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -64,8 +64,6 @@ amdpcib* at pci?              # AMD 8111 LPC bridge
 kate*  at pci?                 # AMD K8 temperature sensor
 km*    at pci?                 # AMD K10 temperature sensor
 
-agp*   at vga?                 # AGP bridge
-
 # National Semiconductor LM7[89] and compatible hardware monitors
 lm0    at isa? port 0x290
 #lm1   at isa? port 0x280
@@ -263,6 +261,17 @@ wskbd*             at pckbd? mux 1
 wsmouse*       at pms? mux 0
 wsmouse*       at pmsi? mux 0
 
+agp*           at vga?         # AGP bridge
+#option                DRM_DEBUG
+inteldrm*      at vga? disable # 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? disable # ATI Radeon DRM driver
+#savagedrm*    at vga?         # S3 Savage DRM driver
+#sisdrm*       at vga?         # SiS DRM driver
+#tdfxdrm*      at vga?         # 3dfx (voodoo) DRM driver
+
 pcppi0         at isa?
 
 com0   at isa? port 0x3f8 irq 4        # standard PC serial ports
@@ -572,14 +581,3 @@ pseudo-device      mtrr            1       # Memory range attributes control
 # 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

diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 873c90d..94906d0 100644 (file)
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-#      $OpenBSD: GENERIC,v 1.632 2008/07/20 22:17:50 deraadt Exp $
+#      $OpenBSD: GENERIC,v 1.633 2008/08/02 16:09:29 oga Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -328,12 +328,21 @@ wskbd*            at pckbd? mux 1
 wsmouse*       at pms? mux 0
 wsmouse*       at pmsi? mux 0
 
-agp*           at vga?                 # AGP bridges
-
+agp*           at vga?         # AGP bridges
+#option                DRM_DEBUG
+inteldrm*      at vga? disable # 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? disable # ATI Radeon DRM driver
+#savagedrm*    at vga?         # S3 Savage DRM driver
+#sisdrm*       at vga?         # SiS DRM driver
+#tdfxdrm*      at vga?         # 3dfx (voodoo) DRM driver
+
+#option                VESABIOSVERBOSE
+#option                VESAFB          # VESA bios framebuffer support for X11
 #vesabios0     at mainbus?
-# option       VESABIOSVERBOSE
 
-#option        VESAFB                  # VESA bios framebuffer support for X11
 
 pcppi0         at isa?
 
@@ -780,14 +789,3 @@ 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