From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Mark Brown <broonie@opensource•wolfsonmicro.com>,
Liam Girdwood <lrg@slimlogic•co.uk>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Ben Dooks <ben-linux@fluff•org>
Subject: linux-next: manual merge of the sound-asoc tree with the samsung tree
Date: Tue, 17 Aug 2010 12:21:37 +1000 [thread overview]
Message-ID: <20100817122137.aa6f269e.sfr@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the sound-asoc tree got a conflict in
arch/arm/mach-s3c64xx/mach-smdk6410.c between commit
96e9d908a7b5b5be774ba26aca0d6633e7c97f63 ("ARM: SMDK6410: Register AC97
controller") from the samsung tree and commit
f0fba2ad1b6b53d5360125c41953b7afcd6deff0 ("ASoC: multi-component - ASoC
Multi-Component Support") from the sound-asoc tree.
Just overlapping additions. I fixed it up (see below) and can carry the
fix as necessary.
--
Stephen Rothwell <sfr@canb•auug.org.au>
diff --cc arch/arm/mach-s3c64xx/mach-smdk6410.c
index c0f46e0,ecbddd3..0000000
--- a/arch/arm/mach-s3c64xx/mach-smdk6410.c
+++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c
@@@ -284,7 -283,7 +284,8 @@@ static struct platform_device *smdk6410
&s3c_device_fb,
&s3c_device_ohci,
&s3c_device_usb_hsotg,
+ &s3c64xx_device_ac97,
+ &s3c_device_pcm,
&s3c64xx_device_iisv4,
&samsung_device_keypad,
next reply other threads:[~2010-08-17 2:21 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-17 2:21 Stephen Rothwell [this message]
2010-08-17 9:30 ` linux-next: manual merge of the sound-asoc tree with the samsung tree 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=20100817122137.aa6f269e.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=ben-linux@fluff$(echo .)org \
--cc=broonie@opensource$(echo .)wolfsonmicro.com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=lrg@slimlogic$(echo .)co.uk \
/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