diff mbox

[v2,1/2] ASoC: Fix wrong include for McPDM

Message ID 1349339236-3622-2-git-send-email-peter.ujfalusi@ti.com (mailing list archive)
State New, archived
Headers show

Commit Message

Peter Ujfalusi Oct. 4, 2012, 8:27 a.m. UTC 
From: Tony Lindgren <tony@atomide.com>

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@atomide.com>
---
 sound/soc/omap/omap-mcpdm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Mark Brown Oct. 4, 2012, 5:47 p.m. UTC | #1 
On Thu, Oct 04, 2012 at 11:27:15AM +0300, Peter Ujfalusi wrote:
> From: Tony Lindgren <tony@atomide.com>
> 
> 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.

This doesn't apply, don't know what it was generated against...
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Mark Brown Oct. 4, 2012, 5:48 p.m. UTC | #2 
On Thu, Oct 04, 2012 at 11:27:15AM +0300, Peter Ujfalusi wrote:
> From: Tony Lindgren <tony@atomide.com>
> 
> 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.

Sorry, it does apply - git am got the two patches the wrong way round.
Applied both now, thanks.
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Mark Brown Oct. 4, 2012, 5:49 p.m. UTC | #3 
On Thu, Oct 04, 2012 at 11:27:15AM +0300, Peter Ujfalusi wrote:

> Signed-off-by: Tony Lindgren <tony@atomide.com>

Peter, you should sign off any patches you forward on.  I applied this
anyway since it's so trivial and I'd seen the original posting.
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/omap/omap-mcpdm.c
index 7755650..fdf655e 100644
--- 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"