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 <[email protected]> for pointing out the issue.

Signed-off-by: Jarkko Nikula <[email protected]>
Acked-by: Liam Girdwood <[email protected]>
Signed-off-by: Mark Brown <[email protected]>

diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index e7b680248006524012531c0e78d165e01e09ea4b..0195b7ee17e13c4036a64b5f07c01b2cd1f7b26e 100644 (file)
--- 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 78d3560fa25a264c17f47f525b4fec02b67cc743..041e98b493b70888ed2b2d323e101ddf009ca8c5 100644 (file)
--- 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