From aa6b3456340917b91a62b9205e14159e41761caf Mon Sep 17 00:00:00 2001 From: Emmanuel Vadot Date: Sun, 12 Mar 2017 00:52:16 +0000 Subject: [PATCH] Remove i915drm and radeondrm from NOTES and conf. This unbreak LINT kernel. Reported by: lwhsu --- sys/amd64/conf/NOTES | 2 -- sys/conf/files | 16 ---------------- sys/i386/conf/NOTES | 2 -- 3 files changed, 20 deletions(-) diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES index 5b92f9847610..70af189d7b24 100644 --- a/sys/amd64/conf/NOTES +++ b/sys/amd64/conf/NOTES @@ -288,11 +288,9 @@ device cpufreq # Direct Rendering modules for 3D acceleration. device drm # DRM core module required by DRM drivers -device i915drm # Intel i830 through i915 device mach64drm # ATI Rage Pro, Rage Mobility P/M, Rage XL device mgadrm # AGP Matrox G200, G400, G450, G550 device r128drm # ATI Rage 128 -device radeondrm # ATI Radeon device savagedrm # S3 Savage3D, Savage4 device sisdrm # SiS 300/305, 540, 630 device tdfxdrm # 3dfx Voodoo 3/4/5 and Banshee diff --git a/sys/conf/files b/sys/conf/files index 90d4a43542d5..dbf0fbde290a 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1458,11 +1458,6 @@ dev/drm/drm_scatter.c optional drm dev/drm/drm_sman.c optional drm dev/drm/drm_sysctl.c optional drm dev/drm/drm_vm.c optional drm -dev/drm/i915_dma.c optional i915drm -dev/drm/i915_drv.c optional i915drm -dev/drm/i915_irq.c optional i915drm -dev/drm/i915_mem.c optional i915drm -dev/drm/i915_suspend.c optional i915drm dev/drm/mach64_dma.c optional mach64drm dev/drm/mach64_drv.c optional mach64drm dev/drm/mach64_irq.c optional mach64drm @@ -1477,17 +1472,6 @@ dev/drm/r128_cce.c optional r128drm \ dev/drm/r128_drv.c optional r128drm dev/drm/r128_irq.c optional r128drm dev/drm/r128_state.c optional r128drm -dev/drm/r300_cmdbuf.c optional radeondrm -dev/drm/r600_blit.c optional radeondrm -dev/drm/r600_cp.c optional radeondrm \ - compile-with "${NORMAL_C} ${NO_WCONSTANT_CONVERSION}" -dev/drm/radeon_cp.c optional radeondrm \ - compile-with "${NORMAL_C} ${NO_WCONSTANT_CONVERSION}" -dev/drm/radeon_cs.c optional radeondrm -dev/drm/radeon_drv.c optional radeondrm -dev/drm/radeon_irq.c optional radeondrm -dev/drm/radeon_mem.c optional radeondrm -dev/drm/radeon_state.c optional radeondrm dev/drm/savage_bci.c optional savagedrm dev/drm/savage_drv.c optional savagedrm dev/drm/savage_state.c optional savagedrm diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 392bba120864..041bd9268a3c 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -508,11 +508,9 @@ device cpufreq # Direct Rendering modules for 3D acceleration. device drm # DRM core module required by DRM drivers -device i915drm # Intel i830 through i915 device mach64drm # ATI Rage Pro, Rage Mobility P/M, Rage XL device mgadrm # AGP Matrox G200, G400, G450, G550 device r128drm # ATI Rage 128 -device radeondrm # ATI Radeon device savagedrm # S3 Savage3D, Savage4 device sisdrm # SiS 300/305, 540, 630 device tdfxdrm # 3dfx Voodoo 3/4/5 and Banshee