From: Takashi Iwai <tiwai@suse•de>
To: Eric Miao <ymiao3@marvell•com>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
"linux-next@vger•kernel.org" <linux-next@vger•kernel.org>,
Philipp Zabel <philipp.zabel@gmail•com>
Subject: Re: linux-next: manual merge of the sound tree with the pxa tree
Date: Tue, 10 Feb 2009 09:58:02 +0100 [thread overview]
Message-ID: <s5h8woehdnp.wl%tiwai@suse.de> (raw)
In-Reply-To: <F71A24FDAED97E4CB6D3A8E8A97D5C544138A8DA@SC-VEXCH1.marvell.com>
At Mon, 9 Feb 2009 19:35:07 -0800,
Eric Miao wrote:
>
> > Just simple context change. I fiex it up (see below) and can carry the
> > fix as necessary.
>
> Yes, this is correct. Thanks Stephen.
Confirmed to build fine with cross platform now.
Thanks.
Takashi
> >
> > --
> > 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 prev parent reply other threads:[~2009-02-10 8:58 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-10 3:22 linux-next: manual merge of the sound tree with the pxa tree Stephen Rothwell
2009-02-10 3:35 ` Eric Miao
2009-02-10 8:58 ` Takashi Iwai [this message]
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=s5h8woehdnp.wl%tiwai@suse.de \
--to=tiwai@suse$(echo .)de \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=philipp.zabel@gmail$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=ymiao3@marvell$(echo .)com \
/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