Messages in this thread | | | Date | Tue, 27 Jan 2015 13:39:05 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the drm-panel tree with the drm tree |
| |
Hi Thierry,
Today's linux-next merge of the drm-panel tree got a conflict in drivers/gpu/drm/bridge/Kconfig between commit b21f4b658df8 ("drm: imx: imx-hdmi: move imx-hdmi to bridge/dw_hdmi") from the drm tree and commit c338dcdcc7b6 ("drm/bridge: ptn3460: Convert to I2C driver model") from the drm-panel tree.
I fixed it up (see below) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/gpu/drm/bridge/Kconfig index b70f3c8d4e8a,146e67bb037b..000000000000 --- a/drivers/gpu/drm/bridge/Kconfig +++ b/drivers/gpu/drm/bridge/Kconfig @@@ -1,10 -1,8 +1,13 @@@ config DRM_PTN3460 tristate "PTN3460 DP/LVDS bridge" depends on DRM + depends on OF select DRM_KMS_HELPER + select DRM_PANEL ---help--- + ptn3460 eDP-LVDS bridge chip driver. + +config DRM_DW_HDMI + tristate + depends on DRM + select DRM_KMS_HELPER [unhandled content-type:application/pgp-signature] | |