diff options
Diffstat (limited to 'sys/arch/amd64')
| -rw-r--r-- | sys/arch/amd64/amd64/conf.c | 6 | ||||
| -rw-r--r-- | sys/arch/amd64/conf/GENERIC | 12 |
2 files changed, 13 insertions, 5 deletions
diff --git a/sys/arch/amd64/amd64/conf.c b/sys/arch/amd64/amd64/conf.c index cc2720bf999..61060c33ea1 100644 --- a/sys/arch/amd64/amd64/conf.c +++ b/sys/arch/amd64/amd64/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.22 2008/06/10 07:12:24 mglocker Exp $ */ +/* $OpenBSD: conf.c,v 1.23 2008/11/22 21:26:47 oga Exp $ */ /* * Copyright (c) 1994, 1995 Charles M. Hannum. All rights reserved. @@ -174,7 +174,7 @@ cdev_decl(cztty); cdev_decl(nvram); #include "agp.h" cdev_decl(agp); -#include "drmbase.h" +#include "drm.h" cdev_decl(drm); #include "wsdisplay.h" @@ -299,7 +299,7 @@ struct cdevsw cdevsw[] = cdev_bthub_init(NBTHUB,bthub), /* 84: bthub */ cdev_nvram_init(NNVRAM,nvram), /* 85: NVRAM interface */ cdev_agp_init(NAGP,agp), /* 86: agp */ - cdev_drm_init(NDRMBASE,drm), /* 87: drm */ + cdev_drm_init(NDRM,drm), /* 87: drm */ }; int nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]); diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC index 1002709705d..e3a3ff9535b 100644 --- a/sys/arch/amd64/conf/GENERIC +++ b/sys/arch/amd64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.246 2008/11/09 15:11:19 oga Exp $ +# $OpenBSD: GENERIC,v 1.247 2008/11/22 21:26:47 oga Exp $ # # For further information on compiling OpenBSD kernels, see the config(8) # man page. @@ -265,16 +265,24 @@ wsmouse* at pmsi? mux 0 intagp* at vga? # intel integrated graphics agp* at intagp? -#agp* at vga? # AGP bridge + #option DRM_DEBUG inteldrm* at vga? # Intel i915, i945 DRM driver +drm* at inteldrm? #machdrm* at vga? # mach64 (3D Rage Pro, Rage) DRM driver +#drm* at machdrm? #mgadrm* at vga? # Matrox G[24]00, G[45]50 DRM driver +#drm* at mgadrm? #ragedrm* at vga? # ATI Rage 128 DRM driver +#drm* at ragedrm? radeondrm* at vga? # ATI Radeon DRM driver +drm* at radeondrm? #savagedrm* at vga? # S3 Savage DRM driver +#drm* at savagedrm? #sisdrm* at vga? # SiS DRM driver +#drm* at sisdrm? #tdfxdrm* at vga? # 3dfx (voodoo) DRM driver +#drm* at tdfxdrm? pcppi0 at isa? |