diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-05 09:23:15 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-05 09:23:15 +0000 |
commit | 62a5715c0af49b62b331c2538025a8ab5ce6c6e5 (patch) | |
tree | d4ddd30e61ba20eca4a3ba0f63f2e33c8573dfa0 /src/VBox/Additions/linux/drm/vbox_drv.c | |
parent | Releasing progress-linux version 7.0.18-dfsg-2~progress7.99u1. (diff) | |
download | virtualbox-62a5715c0af49b62b331c2538025a8ab5ce6c6e5.tar.xz virtualbox-62a5715c0af49b62b331c2538025a8ab5ce6c6e5.zip |
Merging upstream version 7.0.20-dfsg.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/VBox/Additions/linux/drm/vbox_drv.c')
-rw-r--r-- | src/VBox/Additions/linux/drm/vbox_drv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/VBox/Additions/linux/drm/vbox_drv.c b/src/VBox/Additions/linux/drm/vbox_drv.c index 7d2561dd..1712c2b7 100644 --- a/src/VBox/Additions/linux/drm/vbox_drv.c +++ b/src/VBox/Additions/linux/drm/vbox_drv.c @@ -395,7 +395,7 @@ static struct drm_driver driver = { #endif .gem_prime_import = drm_gem_prime_import, .gem_prime_import_sg_table = vbox_gem_prime_import_sg_table, -#if RTLNX_VER_MAX(6,6,0) && !RTLNX_RHEL_RANGE(9,4, 9,99) +#if RTLNX_VER_MAX(6,6,0) && !RTLNX_RHEL_RANGE(9,4, 9,99) && !RTLNX_SUSE_MAJ_PREREQ(15, 6) .gem_prime_mmap = vbox_gem_prime_mmap, #endif |