diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-29 22:03:20 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-29 22:03:20 +0200 |
| commit | 2c9504228fe4e4cc65f3debf6d2a6a0f44cf4c2d (patch) | |
| tree | 72200e6f6f5877b35dab173ef47a463f98223dbb /sound/soc/codecs/wm8994.c | |
| parent | ASoC: ad193x: move codec register/unregister to bus probe/remove (diff) | |
| parent | ASoC: Fix passing platform_data to ac97 bus users and fix a leak (diff) | |
| download | linux-2c9504228fe4e4cc65f3debf6d2a6a0f44cf4c2d.tar.xz linux-2c9504228fe4e4cc65f3debf6d2a6a0f44cf4c2d.zip | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index d01d3091fe81..bdda0936a404 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, |