Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c8f2c42 authored Nov 21, 2010 by Jarkko Nikula Committed by Mark Brown Nov 22, 2010

ASoC: Fix compile breakage in jz4740.c and smartq_wm8987.c



Commit ce6120cc 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>

parent 9e18e186

sound/soc/codecs/jz4740.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -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

sound/soc/s3c24xx/smartq_wm8987.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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>