From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Takashi Iwai <tiwai@suse•de>
Cc: linux-next@vger•kernel.org,
Philipp Zabel <philipp.zabel@gmail•com>,
Eric Miao <eric.miao@marvell•com>
Subject: linux-next: manual merge of the sound tree with the pxa tree
Date: Tue, 10 Feb 2009 14:22:30 +1100 [thread overview]
Message-ID: <20090210142230.07fdfe43.sfr@canb.auug.org.au> (raw)
Hi Takashi,
Today's linux-next merge of the sound tree got a conflict in
sound/soc/pxa/pxa2xx-i2s.c between commit
69e2a881351e31e936e3a75f8efff768f0edb2be ("[ARM] pxa: move DMA registers
definitions into <mach/dma.h>") from the pxa tree and commit
44dd2b9168350b82a671ce71666b99208ab2d973 ("ASoC: pxa2xx-i2s: remove I2S
pin setup") from the sound tree.
Just simple context change. I fiex it up (see below) and can carry the
fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc sound/soc/pxa/pxa2xx-i2s.c
index 223de89,83b59d7..0000000
--- a/sound/soc/pxa/pxa2xx-i2s.c
+++ b/sound/soc/pxa/pxa2xx-i2s.c
@@@ -24,8 -24,7 +24,7 @@@
#include <sound/pxa2xx-lib.h>
#include <mach/hardware.h>
-#include <mach/pxa-regs.h>
+#include <mach/dma.h>
- #include <mach/pxa2xx-gpio.h>
#include <mach/audio.h>
#include "pxa2xx-pcm.h"
next reply other threads:[~2009-02-10 3:22 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-10 3:22 Stephen Rothwell [this message]
2009-02-10 3:35 ` linux-next: manual merge of the sound tree with the pxa tree Eric Miao
2009-02-10 8:58 ` Takashi Iwai
2009-02-10 10:36 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2009-01-23 3:01 Stephen Rothwell
2009-01-23 3:08 ` Ian Molton
2009-01-23 11:31 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090210142230.07fdfe43.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=eric.miao@marvell$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=philipp.zabel@gmail$(echo .)com \
--cc=tiwai@suse$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox