From: Jarkko Nikula <jhnikula@gmail.com>
Date: Sun, 21 Nov 2010 17:48:47 +0000 (+0200)
Subject: ASoC: Remove cyclic dependency between soc.h and soc-dapm.h/soc-dai.h
X-Git-Tag: v2.6.38-rc1~236^2^2~167
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=851cad5aa11a0692c4c92ebbfa94d06564034dcc;p=thirdparty%2Fkernel%2Flinux.git

ASoC: Remove cyclic dependency between soc.h and soc-dapm.h/soc-dai.h

There is no need anymore to include soc.h in soc-dapm.h and soc-dai.h as
drivers are converted to include only soc.h.

Thanks to Lars-Peter Clausen <lars@metafoo.de> for pointing out the issue.

Signed-off-by: Jarkko Nikula <jhnikula@gmail.com>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---

diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index e7b6802480065..0195b7ee17e13 100644
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -16,8 +16,6 @@
 
 #include <linux/list.h>
 
-#include <sound/soc.h>
-
 struct snd_pcm_substream;
 
 /*
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index 78d3560fa25a2..041e98b493b70 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -16,7 +16,6 @@
 #include <linux/device.h>
 #include <linux/types.h>
 #include <sound/control.h>
-#include <sound/soc.h>
 
 /* widget has no PM register bit */
 #define SND_SOC_NOPM	-1