LKML Archive on
help / color / mirror / Atom feed
* linux-next: manual merge of the drm-panel tree with the drm tree
@ 2015-01-27  2:39 Stephen Rothwell
  0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2015-01-27  2:39 UTC (permalink / raw)
  To: Thierry Reding, Dave Airlie
  Cc: linux-next, linux-kernel, Andy Yan, Philipp Zabel, Ajay Kumar

[-- Attachment #1: Type: text/plain, Size: 963 bytes --]

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).

Stephen Rothwell          

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
+ 	  ptn3460 eDP-LVDS bridge chip driver.
 +config DRM_DW_HDMI
 +	tristate
 +	depends on DRM
 +	select DRM_KMS_HELPER

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2015-01-27  2:39 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-01-27  2:39 linux-next: manual merge of the drm-panel tree with the drm tree Stephen Rothwell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).