* linux-next: manual merge of the sound-asoc tree with the samsung tree
@ 2010-08-17 2:21 Stephen Rothwell
2010-08-17 9:30 ` Mark Brown
0 siblings, 1 reply; 2+ messages in thread
From: Stephen Rothwell @ 2010-08-17 2:21 UTC (permalink / raw)
To: Mark Brown, Liam Girdwood; +Cc: linux-next, linux-kernel, Ben Dooks
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,
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the sound-asoc tree with the samsung tree
2010-08-17 2:21 linux-next: manual merge of the sound-asoc tree with the samsung tree Stephen Rothwell
@ 2010-08-17 9:30 ` Mark Brown
0 siblings, 0 replies; 2+ messages in thread
From: Mark Brown @ 2010-08-17 9:30 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Liam Girdwood, linux-next, linux-kernel, Ben Dooks
On Tue, Aug 17, 2010 at 12:21:37PM +1000, Stephen Rothwell wrote:
> 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.
Oh dear, the AC'97 controller addition was supposed to make it into
2.6.36.
> Just overlapping additions. I fixed it up (see below) and can carry the
> fix as necessary.
Thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-08-17 9:30 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-08-17 2:21 linux-next: manual merge of the sound-asoc tree with the samsung tree Stephen Rothwell
2010-08-17 9:30 ` Mark Brown
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).