From 607c31655b24352238bce2f0676c0288ea97a06e Mon Sep 17 00:00:00 2001 From: kn Date: Sat, 30 Jul 2022 14:15:20 +0000 Subject: [PATCH] Fix build without intagp Pull inteldrm_refcnt out of NINTAGP > 0, otherwise it remains undefined but still used in inteldrm_attachhook(). OK jsg --- sys/dev/pci/drm/i915/i915_drv.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/dev/pci/drm/i915/i915_drv.c b/sys/dev/pci/drm/i915/i915_drv.c index 0510113caef..e8c07f45da2 100644 --- a/sys/dev/pci/drm/i915/i915_drv.c +++ b/sys/dev/pci/drm/i915/i915_drv.c @@ -2007,16 +2007,16 @@ static const struct drm_driver driver = { #include "intagp.h" -#if NINTAGP > 0 -int intagpsubmatch(struct device *, void *, void *); -int intagp_print(void *, const char *); - /* * some functions are only called once on init regardless of how many times * inteldrm attaches in linux this is handled via module_init()/module_exit() */ int inteldrm_refcnt; +#if NINTAGP > 0 +int intagpsubmatch(struct device *, void *, void *); +int intagp_print(void *, const char *); + int intagpsubmatch(struct device *parent, void *match, void *aux) { -- 2.20.1