diff options
author | Thomas Zimmermann <tzimmermann@suse.de> | 2023-01-19 12:56:12 +0300 |
---|---|---|
committer | Thomas Zimmermann <tzimmermann@suse.de> | 2023-01-19 12:56:12 +0300 |
commit | 6f84981772535e670e4e2df051a672af229b6694 (patch) | |
tree | 407cec2ba38b75fc2a1bdefae5b6d3c6405be435 /drivers/gpu/drm/Makefile | |
parent | cba83c1fc38612c3d2c7b1bfed9d882e4848fb0d (diff) | |
parent | 0b45ac1170ea6416bc1d36798414c04870cd356d (diff) | |
download | linux-6f84981772535e670e4e2df051a672af229b6694.tar.xz |
Merge drm/drm-next into drm-misc-next
Backmerging into drm-misc-next to get DRM accelerator infrastructure,
which is required by ipuv driver.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Diffstat (limited to 'drivers/gpu/drm/Makefile')
-rw-r--r-- | drivers/gpu/drm/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index 513dc8cb5346..ab4460fcd63f 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -70,6 +70,7 @@ drm-$(CONFIG_DRM_LOAD_EDID_FIRMWARE) += drm_edid_load.o drm-$(CONFIG_DRM_PRIVACY_SCREEN) += \ drm_privacy_screen.o \ drm_privacy_screen_x86.o +drm-$(CONFIG_DRM_ACCEL) += ../../accel/drm_accel.o obj-$(CONFIG_DRM) += drm.o obj-$(CONFIG_DRM_PANEL_ORIENTATION_QUIRKS) += drm_panel_orientation_quirks.o |