lkml.org 
[lkml]   [2012]   [Sep]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the arm-soc tree with the sound tree
Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
sound/soc/omap/omap-pcm.c between commit 946cc36ae550 ("ASoC: omap-pcm:
Convert to use dmaengine") from the sound tree and commit 7d7e1eba7e92
("ARM: OMAP2+: Prepare for irqs.h removal") from the arm-soc 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 sound/soc/omap/omap-pcm.c
index a2636f6,b309941..0000000
--- a/sound/soc/omap/omap-pcm.c
+++ b/sound/soc/omap/omap-pcm.c
@@@ -29,9 -28,10 +29,10 @@@
#include <sound/core.h>
#include <sound/pcm.h>
#include <sound/pcm_params.h>
+#include <sound/dmaengine_pcm.h>
#include <sound/soc.h>

+ #include <plat/cpu.h>
-#include <plat/dma.h>
#include "omap-pcm.h"

static const struct snd_pcm_hardware omap_pcm_hardware = {
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2012-09-25 09:21    [W:0.019 / U:0.204 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site