[alsa-devel] ASoC: Fix wrong include for McPDM
peter.ujfalusi at ti.com
Thu Oct 4 10:03:42 CEST 2012
On 10/03/2012 07:52 PM, Tony Lindgren wrote:
> McPDM needs platt/cpu.h for omap_rev and not omap_hwmod.h.
> Drivers must not include omap_hwmod.h at, it will be
> private to mach-omap2 soon. Fix the problem before other
> drivers will also start including omap_hwmod.h.
> Note that also plat/cpu.h will be going away, so the
> omap_rev check needs to be replaced with mcpdm-watchdog
> flag from platform_data or DT.
> Signed-off-by: Tony Lindgren <tony at atomide.com>
> Can you guys please queue this as fix for -rc1?
> This removes and unnecessary dependency for making
> omap_hwmod.h local to mach-omap2.
> Then I'm hoping Peter will remove the plat/cpu.h
> dependency for v3.8 merge window ;)
I can remove it for 3.7 as well since there is no need for the revision check
Will send the omap-mcpdm update series for 3.7 in couple of minutes (including
> --- a/sound/soc/omap/omap-mcpdm.c
> +++ b/sound/soc/omap/omap-mcpdm.c
> @@ -40,7 +40,7 @@
> #include <sound/pcm_params.h>
> #include <sound/soc.h>
> -#include <plat/omap_hwmod.h>
> +#include <plat/cpu.h>
> #include "omap-mcpdm.h"
> #include "omap-pcm.h"
More information about the Alsa-devel