diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-29 16:03:20 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-03-29 16:03:20 -0400 |
| commit | 2c9504228fe4e4cc65f3debf6d2a6a0f44cf4c2d (patch) | |
| tree | 72200e6f6f5877b35dab173ef47a463f98223dbb /sound/soc/codecs/wm8994.c | |
| parent | 9dd7b79a86c53a097463ee1582c0bc6c4b83b770 (diff) | |
| parent | fb48e3c6a4d8888aff61fbf567aadac7d206e973 (diff) | |
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[] = { | |||
| 3438 | .rates = WM8994_RATES, | 3438 | .rates = WM8994_RATES, |
| 3439 | .formats = WM8994_FORMATS, | 3439 | .formats = WM8994_FORMATS, |
| 3440 | }, | 3440 | }, |
| 3441 | .playback = { | 3441 | .capture = { |
| 3442 | .stream_name = "AIF3 Capture", | 3442 | .stream_name = "AIF3 Capture", |
| 3443 | .channels_min = 2, | 3443 | .channels_min = 2, |
| 3444 | .channels_max = 2, | 3444 | .channels_max = 2, |