summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/wm8994.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-03-29 21:03:20 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-03-29 21:03:20 +0100
commit2c9504228fe4e4cc65f3debf6d2a6a0f44cf4c2d (patch)
tree72200e6f6f5877b35dab173ef47a463f98223dbb /sound/soc/codecs/wm8994.c
parent9dd7b79a86c53a097463ee1582c0bc6c4b83b770 (diff)
parentfb48e3c6a4d8888aff61fbf567aadac7d206e973 (diff)
downloadop-kernel-dev-2c9504228fe4e4cc65f3debf6d2a6a0f44cf4c2d.zip
op-kernel-dev-2c9504228fe4e4cc65f3debf6d2a6a0f44cf4c2d.tar.gz
Merge branch 'for-2.6.34' into for-2.6.35
Diffstat (limited to 'sound/soc/codecs/wm8994.c')
-rw-r--r--sound/soc/codecs/wm8994.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c
index d01d309..bdda093 100644
--- a/sound/soc/codecs/wm8994.c
+++ b/sound/soc/codecs/wm8994.c
@@ -3438,7 +3438,7 @@ struct snd_soc_dai wm8994_dai[] = {
.rates = WM8994_RATES,
.formats = WM8994_FORMATS,
},
- .playback = {
+ .capture = {
.stream_name = "AIF3 Capture",
.channels_min = 2,
.channels_max = 2,
OpenPOWER on IntegriCloud