* linux-next: manual merge of the v4l-dvb tree with the s390 tree
@ 2013-03-21 1:05 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2013-03-21 1:05 UTC (permalink / raw)
To: Mauro Carvalho Chehab
Cc: linux-next, linux-kernel, Martin Schwidefsky, Heiko Carstens,
Geert Uytterhoeven
[-- Attachment #1: Type: text/plain, Size: 1057 bytes --]
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
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-03-21 1:05 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-03-21 1:05 linux-next: manual merge of the v4l-dvb tree with the s390 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).