From 5037afc72ab529d4d120c858e9e84cbb40acbbca Mon Sep 17 00:00:00 2001 From: Sascha Wildner Date: Sat, 11 Aug 2018 22:39:07 +0200 Subject: [PATCH] kernel/drm: Remove CONFIG_PCI as a kernel option. The code does not link in the absence of it and neither do we expect systems without PCI support configured, nor does it make sense for DRM specific stuff in particular, so just set it unconditionally. If anything, it could be tied to NPCI being >0 (to check if "device pci" is in the kernel), but for that it would have to actually build/link without CONFIG_PCI in the first place. --- sys/conf/options | 1 - sys/config/LINT64 | 3 --- sys/config/X86_64_GENERIC | 3 --- sys/dev/drm/include/drm/drmP.h | 2 ++ 4 files changed, 2 insertions(+), 7 deletions(-) diff --git a/sys/conf/options b/sys/conf/options index 983744c0f6..257dca2748 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -382,7 +382,6 @@ AGP_DEBUG opt_agp.h # DRM options DRM_DEBUG opt_drm.h VGA_SWITCHEROO opt_drm.h -CONFIG_PCI opt_global.h # DPT driver debug flags DPT_MEASURE_PERFORMANCE opt_dpt.h diff --git a/sys/config/LINT64 b/sys/config/LINT64 index 43e41efe34..dcfe465a49 100644 --- a/sys/config/LINT64 +++ b/sys/config/LINT64 @@ -2269,6 +2269,3 @@ options WDOG_DISABLE_ON_PANIC # Automatically disable watchdogs on panic # LED device led options ERROR_LED_ON_PANIC # If an error led is present, light it up on panic - -# Linux / drm subsystem configuration options -options CONFIG_PCI diff --git a/sys/config/X86_64_GENERIC b/sys/config/X86_64_GENERIC index d5338ac538..3e47f54c4e 100644 --- a/sys/config/X86_64_GENERIC +++ b/sys/config/X86_64_GENERIC @@ -335,6 +335,3 @@ device gpio_intel # GPIO support for Intel SoCs #device ichiic device smbus # Bus support, required for smb below. device smbacpi - -# Linux / drm subsystem configuration options -options CONFIG_PCI diff --git a/sys/dev/drm/include/drm/drmP.h b/sys/dev/drm/include/drm/drmP.h index 45137fb908..1a64fd7ed7 100644 --- a/sys/dev/drm/include/drm/drmP.h +++ b/sys/dev/drm/include/drm/drmP.h @@ -34,6 +34,8 @@ #if defined(_KERNEL) || defined(__KERNEL__) +#define CONFIG_PCI 1 + #include #include #include -- 2.11.4.GIT