diff options
author | 2010-11-21 19:48:44 +0200 | |
---|---|---|
committer | 2010-11-22 14:04:05 +0000 | |
commit | 1c8f2c4287bcc1eb596149b2b36be5c809598926 (patch) | |
tree | f3cb03676b418564dd1f8339c221fa066284c13f /sound/soc/codecs | |
parent | Merge branch 'next-samsung-asoc' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
download | linux-1c8f2c4287bcc1eb596149b2b36be5c809598926.tar.gz linux-1c8f2c4287bcc1eb596149b2b36be5c809598926.tar.bz2 linux-1c8f2c4287bcc1eb596149b2b36be5c809598926.zip |
ASoC: Fix compile breakage in jz4740.c and smartq_wm8987.c
Commit ce6120c require that soc-dapm.h cannot be included before soc.h but
these two drivers were not checked. Fix them by including only soc.h as it
includes soc-dapm.h.
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 'sound/soc/codecs')
-rw-r--r-- | sound/soc/codecs/jz4740.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/codecs/jz4740.c b/sound/soc/codecs/jz4740.c index 8a45562a96d4..f7cd346fd727 100644 --- a/sound/soc/codecs/jz4740.c +++ b/sound/soc/codecs/jz4740.c @@ -22,7 +22,6 @@ #include <sound/pcm.h> #include <sound/pcm_params.h> #include <sound/initval.h> -#include <sound/soc-dapm.h> #include <sound/soc.h> #define JZ4740_REG_CODEC_1 0x0 |