[alsa-devel] [PATCH 4/4] ASoC: Remove cyclic dependency between soc.h and soc-dapm.h/soc-dai.h

Jarkko Nikula jhnikula at gmail.com
Sun Nov 21 18:48:47 CET 2010


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 at metafoo.de> for pointing out the issue.

Signed-off-by: Jarkko Nikula <jhnikula at gmail.com>
Cc: Lars-Peter Clausen <lars at metafoo.de>
---
 include/sound/soc-dai.h  |    2 --
 include/sound/soc-dapm.h |    1 -
 2 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index e7b6802..0195b7e 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 78d3560..041e98b 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
-- 
1.7.0.4



More information about the Alsa-devel mailing list