From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Mark Brown <broonie@kernel.org>,
Liam Girdwood <lgirdwood@gmail.com>,
Jason Cooper <jason@lakedaemon.net>, <andrew@lunn.ch>,
<gregory.clement@free-electrons.com>,
<linux-arm-kernel@lists.infradead.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Subject: linux-next: manual merge of the sound-asoc tree with the mvebu tree
Date: Mon, 24 Feb 2014 13:37:52 +1100 [thread overview]
Message-ID: <20140224133752.bc1ffffa4e81edb76a76e555@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1166 bytes --]
Hi all,
Today's linux-next merge of the sound-asoc tree got a conflict in
sound/soc/kirkwood/Kconfig between commit cd34edc2eab2 ("drivers: Enable
building of Kirkwood drivers for mach-mvebu") from the tree and commit
9a0d5113ac0e ("ASoC: kirkwood: enable Kirkwood driver for mvebu
platforms") from the sound-asoc tree.
I fixed it up (Probably incorrectly - 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/kirkwood/Kconfig
index 106e2e22fed2,2dc3ecf34801..000000000000
--- a/sound/soc/kirkwood/Kconfig
+++ b/sound/soc/kirkwood/Kconfig
@@@ -1,6 -1,6 +1,6 @@@
config SND_KIRKWOOD_SOC
tristate "SoC Audio for the Marvell Kirkwood and Dove chips"
- depends on ARCH_KIRKWOOD || ARCH_DOVE || MACH_KIRKWOOD || COMPILE_TEST
- depends on ARCH_KIRKWOOD || ARCH_DOVE || ARCH_MVEBU || COMPILE_TEST
++ depends on ARCH_KIRKWOOD || ARCH_DOVE || MACH_KIRKWOOD || ARCH_MVEBU || COMPILE_TEST
help
Say Y or M if you want to add support for codecs attached to
the Kirkwood I2S interface. You will also need to select the
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2014-02-24 2:38 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-24 2:37 Stephen Rothwell [this message]
2014-02-24 5:54 ` Mark Brown
2014-02-24 15:10 ` Jason Cooper
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=20140224133752.bc1ffffa4e81edb76a76e555@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=andrew@lunn.ch \
--cc=broonie@kernel.org \
--cc=gregory.clement@free-electrons.com \
--cc=jason@lakedaemon.net \
--cc=lgirdwood@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=thomas.petazzoni@free-electrons.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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
all inboxes | Powered by JetHome®