Subject: Re: linux-next: manual merge of the sound tree with the pxa tree

From: Takashi Iwai <[email-masked]>
Date: Tue, 10 Feb 2009 09:58:02 +0100

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                    [email-masked]
> > 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"
>