alsa-devel.alsa-project.org archive mirror
 help / color / mirror / Atom feed
From: Jarkko Nikula <jhnikula@gmail.com>
To: alsa-devel@alsa-project.org
Cc: Mark Brown <broonie@opensource.wolfsonmicro.com>,
	Lars-Peter Clausen <lars@metafoo.de>,
	Liam Girdwood <lrg@slimlogic.co.uk>
Subject: [PATCH 4/4] ASoC: Remove cyclic dependency between soc.h and soc-dapm.h/soc-dai.h
Date: Sun, 21 Nov 2010 19:48:47 +0200	[thread overview]
Message-ID: <1290361727-25162-4-git-send-email-jhnikula@gmail.com> (raw)
In-Reply-To: <1290361727-25162-1-git-send-email-jhnikula@gmail.com>

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>
Cc: Lars-Peter Clausen <lars@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

  parent reply	other threads:[~2010-11-21 17:49 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-11-21 17:48 [PATCH 1/4] ASoC: Fix compile breakage in jz4740.c and smartq_wm8987.c Jarkko Nikula
2010-11-21 17:48 ` [PATCH 2/4] ASoC: Do not include soc-dapm.h Jarkko Nikula
2010-11-21 17:48 ` [PATCH 3/4] ASoC: Do not include soc-dai.h Jarkko Nikula
2010-11-21 17:48 ` Jarkko Nikula [this message]
2010-11-22 13:42 ` [PATCH 1/4] ASoC: Fix compile breakage in jz4740.c and smartq_wm8987.c Liam Girdwood
2010-11-22 14:06 ` Mark Brown

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1290361727-25162-4-git-send-email-jhnikula@gmail.com \
    --to=jhnikula@gmail.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@opensource.wolfsonmicro.com \
    --cc=lars@metafoo.de \
    --cc=lrg@slimlogic.co.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).