diff options
| author | Dave Airlie <airlied@redhat.com> | 2025-12-05 10:16:43 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2025-12-05 10:16:47 +1000 |
| commit | e73c2262041abd630699224159646aa31e5b7697 (patch) | |
| tree | 65d214049a8a46e07695f66a6b7c475dda33f10e | |
| parent | 55a271a0f7e073032e9c8b1c1e30916d90be5a8a (diff) | |
| parent | e45b5df47b07e6ce1138b0a4e70ad0b0c4d72881 (diff) | |
Merge tag 'topic/xe-vfio-2025-12-04' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next
Driver Changes:
- fix VFIO link error for built-in xe module (Arnd Bergmann)
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thomas Hellstrom <thomas.hellstrom@linux.intel.com>
Link: https://patch.msgid.link/aTIA9in2Bo_fA9TN@fedora
| -rw-r--r-- | drivers/gpu/drm/xe/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/xe/Makefile b/drivers/gpu/drm/xe/Makefile index a1f86a59d687..f2b6243ac45d 100644 --- a/drivers/gpu/drm/xe/Makefile +++ b/drivers/gpu/drm/xe/Makefile @@ -184,8 +184,8 @@ xe-$(CONFIG_PCI_IOV) += \ xe_sriov_pf_sysfs.o \ xe_tile_sriov_pf_debugfs.o -ifeq ($(CONFIG_PCI_IOV),y) - xe-$(CONFIG_XE_VFIO_PCI) += xe_sriov_vfio.o +ifdef CONFIG_XE_VFIO_PCI + xe-$(CONFIG_PCI_IOV) += xe_sriov_vfio.o endif # include helpers for tests even when XE is built-in |