ASoC: Fix compile breakage in jz4740.c and smartq_wm8987.c
authorJarkko Nikula <jhnikula@gmail.com>
Sun, 21 Nov 2010 17:48:44 +0000 (19:48 +0200)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 22 Nov 2010 14:04:05 +0000 (14:04 +0000)
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>
sound/soc/codecs/jz4740.c
sound/soc/s3c24xx/smartq_wm8987.c

index 8a45562a96d448470a58eee3da19becfb87e5e9b..f7cd346fd7275d4dee46261a06f52f877923d30b 100644 (file)
@@ -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
index 1f6da1e27b1e75fa57474ce2b43fa2fd04f01f9f..5b07bb9802eec0b5fdf74205bb665ad62985cdd1 100644 (file)
@@ -19,7 +19,7 @@
 
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
-#include <sound/soc-dapm.h>
+#include <sound/soc.h>
 #include <sound/jack.h>
 
 #include <asm/mach-types.h>