diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-04-14 00:32:13 +0200 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-04-14 00:32:13 +0200 |
commit | a84bd2ee81ea1bdbd238cd1c380ec25f50a876c5 (patch) | |
tree | ba054d4b1a20dadec088fd4d8983fb5939227e46 /sound/soc/codecs/lm4857.c | |
parent | ARM: 6872/1: arch:common:Makefile Remove unused config in the Makefile. (diff) | |
parent | ARM: pxa: convert incorrect IRQ_TO_IRQ() to irq_to_gpio() (diff) | |
download | linux-a84bd2ee81ea1bdbd238cd1c380ec25f50a876c5.tar.xz linux-a84bd2ee81ea1bdbd238cd1c380ec25f50a876c5.zip |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into fixes
Diffstat (limited to 'sound/soc/codecs/lm4857.c')
-rw-r--r-- | sound/soc/codecs/lm4857.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/lm4857.c b/sound/soc/codecs/lm4857.c index 72de47e5d040..2c2a681da0d7 100644 --- a/sound/soc/codecs/lm4857.c +++ b/sound/soc/codecs/lm4857.c @@ -161,7 +161,7 @@ static const struct snd_kcontrol_new lm4857_controls[] = { lm4857_get_mode, lm4857_set_mode), }; -/* There is a demux inbetween the the input signal and the output signals. +/* There is a demux between the input signal and the output signals. * Currently there is no easy way to model it in ASoC and since it does not make * much of a difference in practice simply connect the input direclty to the * outputs. */ |