aboutsummaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorJarkko Nikula <jhnikula@gmail.com>2010-11-21 12:48:47 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-11-22 09:05:05 -0500
commit851cad5aa11a0692c4c92ebbfa94d06564034dcc (patch)
tree1c30d040361b6dcd3f99cfce267dcf6e069bec11 /include/sound
parent0d911baebf983931cb37e25b36c3371d9e4b5196 (diff)
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>
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/soc-dai.h2
-rw-r--r--include/sound/soc-dapm.h1
2 files changed, 0 insertions, 3 deletions
diff --git a/include/sound/soc-dai.h b/include/sound/soc-dai.h
index e7b680248006..0195b7ee17e1 100644
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
@@ -16,8 +16,6 @@
16 16
17#include <linux/list.h> 17#include <linux/list.h>
18 18
19#include <sound/soc.h>
20
21struct snd_pcm_substream; 19struct snd_pcm_substream;
22 20
23/* 21/*
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h
index 78d3560fa25a..041e98b493b7 100644
--- a/include/sound/soc-dapm.h
+++ b/include/sound/soc-dapm.h
@@ -16,7 +16,6 @@
16#include <linux/device.h> 16#include <linux/device.h>
17#include <linux/types.h> 17#include <linux/types.h>
18#include <sound/control.h> 18#include <sound/control.h>
19#include <sound/soc.h>
20 19
21/* widget has no PM register bit */ 20/* widget has no PM register bit */
22#define SND_SOC_NOPM -1 21#define SND_SOC_NOPM -1