[PATCH] ASoC: OMAP4: MCPDM: Remove unnecessary include of plat/control.h

[PATCH] ASoC: OMAP4: MCPDM: Remove unnecessary include of plat/control.h

[Anand Gadiyar]

Commit 346a5c890 (OMAP: control: move plat-omap/control.h
to mach-omap2/control.h) in the linux-omap tree removed
plat/control.h and most of its callers. This one slipped
through - breaking the build as below when
CONFIG_SND_OMAP_SOC_MCPDM is defined. Fix this.

  CC      sound/soc/omap/omap-mcpdm.o
sound/soc/omap/omap-mcpdm.c:35: fatal error: plat/control.h: No such file or directory
compilation terminated.
make[3]: *** [sound/soc/omap/omap-mcpdm.o] Error 1
make[2]: *** [sound/soc/omap] Error 2
make[1]: *** [sound/soc] Error 2
make: *** [sound] Error 2

Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
Cc: Misael Lopez Cruz <misael.lopez@ti.com>
Cc: Liam Girdwood <lrg@slimlogic.co.uk>
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Tony Lindgren <tony@atomide.com>
---
This break is reproducible on linux-next as of 20101011;
I think it also exists in mainline, but I did not check.

Probably worth taking this through the ALSA tree with Tony
or Paul's ack. 

I'm not subscribed to the alsa list. Please CC me on replies.

 sound/soc/omap/omap-mcpdm.c |    1 -
 1 file changed, 1 deletion(-)

Index: mainline/sound/soc/omap/omap-mcpdm.c
===================================================================
--- mainline.orig/sound/soc/omap/omap-mcpdm.c
+++ mainline/sound/soc/omap/omap-mcpdm.c
@@ -32,7 +32,6 @@
 #include <sound/initval.h>
 #include <sound/soc.h>
 
-#include <plat/control.h>
 #include <plat/dma.h>
 #include <plat/mcbsp.h>
 #include "mcpdm.h"

Re: [PATCH] ASoC: OMAP4: MCPDM: Remove unnecessary include of plat/control.h

[Mark Brown]

On Tue, Oct 12, 2010 at 06:57:58PM +0530, Anand Gadiyar wrote:
> Commit 346a5c890 (OMAP: control: move plat-omap/control.h
> to mach-omap2/control.h) in the linux-omap tree removed
> plat/control.h and most of its callers. This one slipped
> through - breaking the build as below when
> CONFIG_SND_OMAP_SOC_MCPDM is defined. Fix this.

Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

Re: [PATCH] ASoC: OMAP4: MCPDM: Remove unnecessary include of plat/control.h

[Jarkko Nikula]

On Tue, 12 Oct 2010 14:29:48 +0100
Mark Brown <broonie@opensource.wolfsonmicro.com> wrote:

> On Tue, Oct 12, 2010 at 06:57:58PM +0530, Anand Gadiyar wrote:
> > Commit 346a5c890 (OMAP: control: move plat-omap/control.h
> > to mach-omap2/control.h) in the linux-omap tree removed
> > plat/control.h and most of its callers. This one slipped
> > through - breaking the build as below when
> > CONFIG_SND_OMAP_SOC_MCPDM is defined. Fix this.
> 
> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

Tony, Liam: This must come via linux-omap together with other Paul's
patches. Does not conflict with ASoC multi-component change.

Acked-by: Jarkko Nikula <jhnikula@gmail.com>

Re: [PATCH] ASoC: OMAP4: MCPDM: Remove unnecessary include of plat/control.h

[Paul Walmsley]

On Tue, 12 Oct 2010, Anand Gadiyar wrote:

> Commit 346a5c890 (OMAP: control: move plat-omap/control.h
> to mach-omap2/control.h) in the linux-omap tree removed
> plat/control.h and most of its callers. This one slipped
> through - breaking the build as below when
> CONFIG_SND_OMAP_SOC_MCPDM is defined. Fix this.
> 
>   CC      sound/soc/omap/omap-mcpdm.o
> sound/soc/omap/omap-mcpdm.c:35: fatal error: plat/control.h: No such file or directory
> compilation terminated.
> make[3]: *** [sound/soc/omap/omap-mcpdm.o] Error 1
> make[2]: *** [sound/soc/omap] Error 2
> make[1]: *** [sound/soc] Error 2
> make: *** [sound] Error 2
> 
> Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
> Cc: Misael Lopez Cruz <misael.lopez@ti.com>
> Cc: Liam Girdwood <lrg@slimlogic.co.uk>
> Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>
> Cc: Paul Walmsley <paul@pwsan.com>
> Cc: Tony Lindgren <tony@atomide.com>
> ---
> This break is reproducible on linux-next as of 20101011;
> I think it also exists in mainline, but I did not check.
> 
> Probably worth taking this through the ALSA tree with Tony
> or Paul's ack. 

Acked-by: Paul Walmsley <paul@pwsan.com>

thanks Anand,


- Paul

Re: [PATCH] ASoC: OMAP4: MCPDM: Remove unnecessary include of plat/control.h

[Tony Lindgren]

* Jarkko Nikula <jhnikula@gmail.com> [101012 06:42]:
> On Tue, 12 Oct 2010 14:29:48 +0100
> Mark Brown <broonie@opensource.wolfsonmicro.com> wrote:
> 
> > On Tue, Oct 12, 2010 at 06:57:58PM +0530, Anand Gadiyar wrote:
> > > Commit 346a5c890 (OMAP: control: move plat-omap/control.h
> > > to mach-omap2/control.h) in the linux-omap tree removed
> > > plat/control.h and most of its callers. This one slipped
> > > through - breaking the build as below when
> > > CONFIG_SND_OMAP_SOC_MCPDM is defined. Fix this.
> > 
> > Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> 
> Tony, Liam: This must come via linux-omap together with other Paul's
> patches. Does not conflict with ASoC multi-component change.
> 
> Acked-by: Jarkko Nikula <jhnikula@gmail.com>

Thanks, adding into omap-for-linus.

Tony