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

Today's linux-next merge of the v4l-dvb tree got a conflict in
drivers/media/platform/Kconfig between commit c30f46bcf9b3
("drivers/Kconfig: add several missing GENERIC_HARDIRQS dependencies")
from the s390 tree and commit da508f579965 ("[media] media/v4l2:
VIDEOBUF2_DMA_CONTIG should depend on HAS_DMA") from the v4l-dvb 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/media/platform/Kconfig
index a0639e7,42c62aa..0000000
--- a/drivers/media/platform/Kconfig
+++ b/drivers/media/platform/Kconfig
@@@ -204,7 -204,7 +204,7 @@@ config VIDEO_SAMSUNG_EXYNOS_GS

config VIDEO_SH_VEU
tristate "SuperH VEU mem2mem video processing driver"
- depends on VIDEO_DEV && VIDEO_V4L2 && GENERIC_HARDIRQS
- depends on VIDEO_DEV && VIDEO_V4L2 && HAS_DMA
++ depends on VIDEO_DEV && VIDEO_V4L2 && GENERIC_HARDIRQS && HAS_DMA
select VIDEOBUF2_DMA_CONTIG
select V4L2_MEM2MEM_DEV
help
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2013-03-21 03:01    [W:0.030 / U:0.976 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site