diff options
author | Maxime Ripard <mripard@kernel.org> | 2024-05-27 12:08:31 +0300 |
---|---|---|
committer | Maxime Ripard <mripard@kernel.org> | 2024-05-27 12:08:31 +0300 |
commit | 375c4d1583948cf2439833e4a85d5a0aee853895 (patch) | |
tree | 821f494e7df09af36887f710cfce1fb89600e666 /drivers/gpu/drm/imx | |
parent | 983095eaf6c161ef73d96152bfc1a99ca051cd57 (diff) | |
parent | 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0 (diff) | |
download | linux-375c4d1583948cf2439833e4a85d5a0aee853895.tar.xz |
Merge drm/drm-next into drm-misc-next
Let's start the new release cycle.
Signed-off-by: Maxime Ripard <mripard@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/imx')
-rw-r--r-- | drivers/gpu/drm/imx/ipuv3/Kconfig | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/imx/ipuv3/Kconfig b/drivers/gpu/drm/imx/ipuv3/Kconfig index 5d810ac02171..bacf0655ebaf 100644 --- a/drivers/gpu/drm/imx/ipuv3/Kconfig +++ b/drivers/gpu/drm/imx/ipuv3/Kconfig @@ -35,8 +35,7 @@ config DRM_IMX_LDB config DRM_IMX_HDMI tristate "Freescale i.MX DRM HDMI" - depends on DRM_DW_HDMI - depends on DRM_IMX - depends on OF + select DRM_DW_HDMI + depends on DRM_IMX && OF help Choose this if you want to use HDMI on i.MX6. |