| Message ID | 87fw5wofwm.fsf_-_@octavius.laptop.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tuesday 02 October 2012, Chris Ball wrote: > Commit 293b2da1b61 ("ARM: pxa: move platform_data definitions") > renamed arch/arm/mach-mmp/include/mach/sram.h to > include/linux/platform_data/dma-mmp_tdma.h, but didn't update > mmp-pcm.c which uses the header. Fix the build error. > > Signed-off-by: Chris Ball <cjb@laptop.org> > --- > sound/soc/pxa/mmp-pcm.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/sound/soc/pxa/mmp-pcm.c b/sound/soc/pxa/mmp-pcm.c > index 73ac546..e834faf 100644 > --- a/sound/soc/pxa/mmp-pcm.c > +++ b/sound/soc/pxa/mmp-pcm.c > @@ -15,13 +15,13 @@ > #include <linux/slab.h> > #include <linux/dma-mapping.h> > #include <linux/dmaengine.h> > +#include <linux/platform_data/dma-mmp_tdma.h> > #include <linux/platform_data/mmp_audio.h> > #include <sound/pxa2xx-lib.h> > #include <sound/core.h> > #include <sound/pcm.h> > #include <sound/pcm_params.h> > #include <sound/soc.h> > -#include <mach/sram.h> > #include <sound/dmaengine_pcm.h> > > struct mmp_dma_data { Acked-by: Arnd Bergmann <arnd@arndb.de> Sorry I didn't catch this earlier. The file was only recently added and somehow didn't appear in my build tests.
Hi Arnd, On Tue, Oct 02 2012, Arnd Bergmann wrote: > On Tuesday 02 October 2012, Chris Ball wrote: >> Commit 293b2da1b61 ("ARM: pxa: move platform_data definitions") >> renamed arch/arm/mach-mmp/include/mach/sram.h to >> include/linux/platform_data/dma-mmp_tdma.h, but didn't update >> mmp-pcm.c which uses the header. Fix the build error. >> >> Signed-off-by: Chris Ball <cjb@laptop.org> >> --- >> sound/soc/pxa/mmp-pcm.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) > > Acked-by: Arnd Bergmann <arnd@arndb.de> > > Sorry I didn't catch this earlier. The file was only recently added > and somehow didn't appear in my build tests. Thanks. Do you want to send this to mainline, or should Mark do it? - Chris.
On Friday 05 October 2012, Chris Ball wrote: > On Tue, Oct 02 2012, Arnd Bergmann wrote: > > On Tuesday 02 October 2012, Chris Ball wrote: > >> Commit 293b2da1b61 ("ARM: pxa: move platform_data definitions") > >> renamed arch/arm/mach-mmp/include/mach/sram.h to > >> include/linux/platform_data/dma-mmp_tdma.h, but didn't update > >> mmp-pcm.c which uses the header. Fix the build error. > >> > >> Signed-off-by: Chris Ball <cjb@laptop.org> > >> --- > >> sound/soc/pxa/mmp-pcm.c | 2 +- > >> 1 file changed, 1 insertion(+), 1 deletion(-) > > > > Acked-by: Arnd Bergmann <arnd@arndb.de> > > > > Sorry I didn't catch this earlier. The file was only recently added > > and somehow didn't appear in my build tests. > > Thanks. Do you want to send this to mainline, or should Mark do it? > I think it's better for Mark to queue it up than me. sound/soc/ is his domain, and I don't have any other patches that would go along with this fix. Arnd
On Fri, Oct 05, 2012 at 06:57:00PM +0000, Arnd Bergmann wrote: > On Friday 05 October 2012, Chris Ball wrote: > > Thanks. Do you want to send this to mainline, or should Mark do it? > I think it's better for Mark to queue it up than me. sound/soc/ > is his domain, and I don't have any other patches that would go > along with this fix. Can someone send me the patch please (possibly with a slightly smaller CC list)?
diff --git a/sound/soc/pxa/mmp-pcm.c b/sound/soc/pxa/mmp-pcm.c index 73ac546..e834faf 100644 --- a/sound/soc/pxa/mmp-pcm.c +++ b/sound/soc/pxa/mmp-pcm.c @@ -15,13 +15,13 @@ #include <linux/slab.h> #include <linux/dma-mapping.h> #include <linux/dmaengine.h> +#include <linux/platform_data/dma-mmp_tdma.h> #include <linux/platform_data/mmp_audio.h> #include <sound/pxa2xx-lib.h> #include <sound/core.h> #include <sound/pcm.h> #include <sound/pcm_params.h> #include <sound/soc.h> -#include <mach/sram.h> #include <sound/dmaengine_pcm.h> struct mmp_dma_data {
Commit 293b2da1b61 ("ARM: pxa: move platform_data definitions") renamed arch/arm/mach-mmp/include/mach/sram.h to include/linux/platform_data/dma-mmp_tdma.h, but didn't update mmp-pcm.c which uses the header. Fix the build error. Signed-off-by: Chris Ball <cjb@laptop.org> --- sound/soc/pxa/mmp-pcm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)