diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-12 08:57:07 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-12 08:57:07 -0400 |
| commit | 5dccf54e2b5e469f5577f3fe6ef95a279858d011 (patch) | |
| tree | 7ef9cff29f407bad3bc3cf86341ba52576fb7527 /sound/soc/fsl/imx-ssi.c | |
| parent | 48539f73cb12bc22c6c071e0a9688656126d9a4c (diff) | |
| parent | fa659d830df0bad8fc3a3815a7f36bd8b7ed9254 (diff) | |
Merge remote-tracking branch 'asoc/topic/fsl' into asoc-next
Diffstat (limited to 'sound/soc/fsl/imx-ssi.c')
| -rw-r--r-- | sound/soc/fsl/imx-ssi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/fsl/imx-ssi.c b/sound/soc/fsl/imx-ssi.c index 77300d163b96..4ce2d608b37a 100644 --- a/sound/soc/fsl/imx-ssi.c +++ b/sound/soc/fsl/imx-ssi.c | |||
| @@ -400,7 +400,7 @@ static struct snd_soc_dai_driver imx_ac97_dai = { | |||
| 400 | .stream_name = "AC97 Playback", | 400 | .stream_name = "AC97 Playback", |
| 401 | .channels_min = 2, | 401 | .channels_min = 2, |
| 402 | .channels_max = 2, | 402 | .channels_max = 2, |
| 403 | .rates = SNDRV_PCM_RATE_48000, | 403 | .rates = SNDRV_PCM_RATE_8000_48000, |
| 404 | .formats = SNDRV_PCM_FMTBIT_S16_LE, | 404 | .formats = SNDRV_PCM_FMTBIT_S16_LE, |
| 405 | }, | 405 | }, |
| 406 | .capture = { | 406 | .capture = { |