lkml.org 
[lkml]   [2013]   [Aug]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the renesas tree with the v4l-dvb tree
Hi Simon,

Today's linux-next merge of the renesas tree got a conflict in
arch/arm/configs/marzen_defconfig between commit e0c332c671e7 ("[media]
ARM: shmobile: Marzen: enable VIN and ADV7180 in defconfig") from the
v4l-dvb tree and commit febedc9c9fe3 ("ARM: shmobile: marzen: Select
DRM_RCAR_DU in defconfig") from the renesas 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 arch/arm/configs/marzen_defconfig
index 000e920,26f30be..0000000
--- a/arch/arm/configs/marzen_defconfig
+++ b/arch/arm/configs/marzen_defconfig
@@@ -85,13 -85,8 +85,15 @@@ CONFIG_GPIO_RCAR=
CONFIG_THERMAL=y
CONFIG_RCAR_THERMAL=y
CONFIG_SSB=y
+CONFIG_MEDIA_SUPPORT=y
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_V4L_PLATFORM_DRIVERS=y
+CONFIG_SOC_CAMERA=y
+CONFIG_VIDEO_RCAR_VIN=y
+# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
+CONFIG_VIDEO_ADV7180=y
+ CONFIG_DRM=y
+ CONFIG_DRM_RCAR_DU=y
CONFIG_USB=y
CONFIG_USB_RCAR_PHY=y
CONFIG_MMC=y
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2013-08-30 08:41    [W:0.034 / U:0.628 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site