diff options
author | Dave Airlie <airlied@redhat.com> | 2018-05-18 06:08:53 +0200 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2018-05-18 06:08:53 +0200 |
commit | 1fafef9dfe127bdd4600eeaca302f0c1cb4ee5d0 (patch) | |
tree | f829e8a26fc768666eb5f827bf5817892ea7e46c /drivers/gpu/drm/bridge/Kconfig | |
parent | drm: rcar-du: Fix build failure (diff) | |
parent | drm: set FMODE_UNSIGNED_OFFSET for drm files (diff) | |
download | linux-1fafef9dfe127bdd4600eeaca302f0c1cb4ee5d0.tar.xz linux-1fafef9dfe127bdd4600eeaca302f0c1cb4ee5d0.zip |
Merge drm-fixes-for-v4.17-rc6-urgent into drm-next
Need to backmerge some nouveau fixes to reduce
the nouveau -next conflicts a lot.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/bridge/Kconfig')
-rw-r--r-- | drivers/gpu/drm/bridge/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/bridge/Kconfig b/drivers/gpu/drm/bridge/Kconfig index 1d75d3a1f951..fa2c7997e2fd 100644 --- a/drivers/gpu/drm/bridge/Kconfig +++ b/drivers/gpu/drm/bridge/Kconfig @@ -84,6 +84,7 @@ config DRM_SIL_SII8620 tristate "Silicon Image SII8620 HDMI/MHL bridge" depends on OF && RC_CORE select DRM_KMS_HELPER + imply EXTCON help Silicon Image SII8620 HDMI/MHL bridge chip driver. |