diff options
| author | Gustavo Padovan <gustavo.padovan@collabora.com> | 2018-06-20 18:22:22 +0200 |
|---|---|---|
| committer | Gustavo Padovan <gustavo.padovan@collabora.com> | 2018-06-20 18:22:22 +0200 |
| commit | d98c71dadc2d0debdb80beb5a478baf1e6f98758 (patch) | |
| tree | bf873c28d3acced1814f8b2dba4ae69d2ed77333 /drivers/gpu/drm/bridge/Kconfig | |
| parent | drm: writeback: Add client capability for exposing writeback connectors (diff) | |
| parent | Merge branch 'drm-next-4.18' of git://people.freedesktop.org/~agd5f/linux int... (diff) | |
| download | linux-d98c71dadc2d0debdb80beb5a478baf1e6f98758.tar.xz linux-d98c71dadc2d0debdb80beb5a478baf1e6f98758.zip | |
Merge drm-upstream/drm-next into drm-misc-next
We got a few conflicts in drm_atomic.c after merging the DRM writeback support,
now we need a backmerge to unlock develop development on drm-misc-next.
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.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 5cc4a51e1e92..bf6cad6c9178 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 select DRM_KMS_HELPER + imply EXTCON select INPUT select RC_CORE help |