diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-18 10:05:33 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-18 10:05:33 -0400 |
| commit | 23abd863d2d6072eefbbf77543c349cd8a9fc5d8 (patch) | |
| tree | 0015d453518c400cff3911a148860b4514e99a9f /sound/soc/fsl/imx-ssi.c | |
| parent | d45a26bd9790fcde58cf4b11a775ff56c6b44e0b (diff) | |
| parent | cd3ff762991ebf309e089ed5a87a8965f175f46a (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 9128b7b26ecf..935eee204bce 100644 --- a/sound/soc/fsl/imx-ssi.c +++ b/sound/soc/fsl/imx-ssi.c | |||
| @@ -386,7 +386,7 @@ static struct snd_soc_dai_driver imx_ac97_dai = { | |||
| 386 | .stream_name = "AC97 Playback", | 386 | .stream_name = "AC97 Playback", |
| 387 | .channels_min = 2, | 387 | .channels_min = 2, |
| 388 | .channels_max = 2, | 388 | .channels_max = 2, |
| 389 | .rates = SNDRV_PCM_RATE_48000, | 389 | .rates = SNDRV_PCM_RATE_8000_48000, |
| 390 | .formats = SNDRV_PCM_FMTBIT_S16_LE, | 390 | .formats = SNDRV_PCM_FMTBIT_S16_LE, |
| 391 | }, | 391 | }, |
| 392 | .capture = { | 392 | .capture = { |