diff --git a/sys/conf/NOTES b/sys/conf/NOTES index de5a18d79562..a37cab138ad3 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -1126,26 +1126,6 @@ options SC_NO_SUSPEND_VTYSWITCH # Optional devices: # -# DRM options: -# gammadrm: 3Dlabs Oxygen GMX 2000 -# mgadrm: AGP Matrox G200, G400, G450, G550 -# tdfxdrm: 3dfx Voodoo 3/4/5 and Banshee -# r128drm: AGP ATI Rage 128 -# radeondrm: AGP ATI Radeon, including 7200 and 7500 -# DRM_LINUX: include linux compatibility, requires COMPAT_LINUX -# DRM_DEBUG: inlcude debugging code, very slow -# -# mga, r128, and radeon require AGP in the kernel - -device gammadrm -device mgadrm -device "r128drm" -device radeondrm -device tdfxdrm - -options DRM_DEBUG -options DRM_LINUX - # 3Dfx Voodoo Graphics, Voodoo II /dev/3dfx CDEV support. This will create # the /dev/3dfx0 device to work with glide implementations. This should get # linked to /dev/3dfx and /dev/voodoo. Note that this is not the same as diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 8094507e20c9..c93b281b541a 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -407,6 +407,26 @@ hint.npx.0.irq="13" device acpi options ACPI_DEBUG +# DRM options: +# gammadrm: 3Dlabs Oxygen GMX 2000 +# mgadrm: AGP Matrox G200, G400, G450, G550 +# tdfxdrm: 3dfx Voodoo 3/4/5 and Banshee +# r128drm: AGP ATI Rage 128 +# radeondrm: AGP ATI Radeon, including 7200 and 7500 +# DRM_LINUX: include linux compatibility, requires COMPAT_LINUX +# DRM_DEBUG: inlcude debugging code, very slow +# +# mga, r128, and radeon require AGP in the kernel + +device gammadrm +device mgadrm +device "r128drm" +device radeondrm +device tdfxdrm + +options DRM_DEBUG +options DRM_LINUX + # M-systems DiskOnchip products see src/sys/contrib/dev/fla/README device fla hint.fla.0.at="isa"