Hi Peter,

That might be a little bit too late for this merge window, but since that patch should not conflict with all the changes we are doing in l-o, you should be able to merge it from alsa.

On 7/7/2011 2:27 PM, Ujfalusi, Peter wrote:
Signed-off-by: Peter Ujfalusi<[email protected]>
Signed-off-by: Jorge Eduardo Candelaria
Signed-off-by: Margarita Olaya Cabrera
Signed-off-by: Liam Girdwood<[email protected]>

Acked-by: Benoit Cousson <[email protected]>

Regards,
Benoit


---
  arch/arm/mach-omap2/omap_hwmod_44xx_data.c |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c 
b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index e1c69ff..63e7c41 100644
--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@ -5121,7 +5121,7 @@ static __initdata struct omap_hwmod *omap44xx_hwmods[] = {
        &omap44xx_mcbsp4_hwmod,

        /* mcpdm class */
-/*     &omap44xx_mcpdm_hwmod, */
+       &omap44xx_mcpdm_hwmod,

        /* mcspi class */
        &omap44xx_mcspi1_hwmod,

--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to