diff options
author | Jarkko Nikula <jhnikula@gmail.com> | 2010-11-21 12:48:45 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-11-22 09:04:41 -0500 |
commit | 505fb824e754efcc9702ce68d3911e7b86d3c690 (patch) | |
tree | 8901c7bd9fb7bef8be8e4638f5b2116f0969cb5e /sound/soc/jz4740 | |
parent | 1c8f2c4287bcc1eb596149b2b36be5c809598926 (diff) |
ASoC: Do not include soc-dapm.h
There is no need to include soc-dapm.h since soc.h includes it.
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/jz4740')
-rw-r--r-- | sound/soc/jz4740/jz4740-i2s.c | 1 | ||||
-rw-r--r-- | sound/soc/jz4740/qi_lb60.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/sound/soc/jz4740/jz4740-i2s.c b/sound/soc/jz4740/jz4740-i2s.c index f3cffd183401..419bf4f5534a 100644 --- a/sound/soc/jz4740/jz4740-i2s.c +++ b/sound/soc/jz4740/jz4740-i2s.c | |||
@@ -28,7 +28,6 @@ | |||
28 | #include <sound/pcm.h> | 28 | #include <sound/pcm.h> |
29 | #include <sound/pcm_params.h> | 29 | #include <sound/pcm_params.h> |
30 | #include <sound/soc.h> | 30 | #include <sound/soc.h> |
31 | #include <sound/soc-dapm.h> | ||
32 | #include <sound/initval.h> | 31 | #include <sound/initval.h> |
33 | 32 | ||
34 | #include "jz4740-i2s.h" | 33 | #include "jz4740-i2s.h" |
diff --git a/sound/soc/jz4740/qi_lb60.c b/sound/soc/jz4740/qi_lb60.c index 70afbfada9fd..49723e3e7e38 100644 --- a/sound/soc/jz4740/qi_lb60.c +++ b/sound/soc/jz4740/qi_lb60.c | |||
@@ -19,7 +19,6 @@ | |||
19 | #include <sound/core.h> | 19 | #include <sound/core.h> |
20 | #include <sound/pcm.h> | 20 | #include <sound/pcm.h> |
21 | #include <sound/soc.h> | 21 | #include <sound/soc.h> |
22 | #include <sound/soc-dapm.h> | ||
23 | #include <linux/gpio.h> | 22 | #include <linux/gpio.h> |
24 | 23 | ||
25 | #define QI_LB60_SND_GPIO JZ_GPIO_PORTB(29) | 24 | #define QI_LB60_SND_GPIO JZ_GPIO_PORTB(29) |