aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/jz4740
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2010-08-15 11:48:47 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-08-17 07:10:30 -0400
commit3ca2ecd9200a8ef5b548e9c40253d75982c54886 (patch)
tree8edd035f55fab38c25b443cd5618ee1c3ec03882 /sound/soc/jz4740
parent366624ba7a2a03160cd5343ba109105758d45ff9 (diff)
ASoC: Multi-component: JZ4740: QI_LB60 board fixes
This patch contains two small fixes for the sound board driver for the qi_lb60 introduced by the multi-component patches: * Remove unnecessary includes: Those includes where only used to get the definitions for the DAI devices and are thus not needed anymore. * Fix a typo. Signed-off-By: Lars-Peter Clausen <lars@metafoo.de> 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/qi_lb60.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/sound/soc/jz4740/qi_lb60.c b/sound/soc/jz4740/qi_lb60.c
index 78dabebe8fd0..ef1a99e6a3bd 100644
--- a/sound/soc/jz4740/qi_lb60.c
+++ b/sound/soc/jz4740/qi_lb60.c
@@ -22,11 +22,6 @@
22#include <sound/soc-dapm.h> 22#include <sound/soc-dapm.h>
23#include <linux/gpio.h> 23#include <linux/gpio.h>
24 24
25#include "../codecs/jz4740.h"
26#include "jz4740-pcm.h"
27#include "jz4740-i2s.h"
28
29
30#define QI_LB60_SND_GPIO JZ_GPIO_PORTB(29) 25#define QI_LB60_SND_GPIO JZ_GPIO_PORTB(29)
31#define QI_LB60_AMP_GPIO JZ_GPIO_PORTD(4) 26#define QI_LB60_AMP_GPIO JZ_GPIO_PORTD(4)
32 27
@@ -86,7 +81,7 @@ static struct snd_soc_dai_link qi_lb60_dai = {
86 .name = "jz4740", 81 .name = "jz4740",
87 .stream_name = "jz4740", 82 .stream_name = "jz4740",
88 .cpu_dai_name = "jz4740-i2s", 83 .cpu_dai_name = "jz4740-i2s",
89 .platform_name = "jz4740-pmc-audio", 84 .platform_name = "jz4740-pcm-audio",
90 .codec_dai_name = "jz4740-hifi", 85 .codec_dai_name = "jz4740-hifi",
91 .codec_name = "jz4740-codec", 86 .codec_name = "jz4740-codec",
92 .init = qi_lb60_codec_init, 87 .init = qi_lb60_codec_init,