diff options
| author | Mark Brown <broonie@linaro.org> | 2014-01-16 07:42:57 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-01-16 07:42:57 -0500 |
| commit | 2f43a23ab9ea1865a663e100b0af20198decb4f1 (patch) | |
| tree | 7501fb678115cbbdb544c43dc7b59f95408f1f52 /sound/soc/s6000 | |
| parent | 7cfa7b547337faf5890c8c5f091e081fb79caf73 (diff) | |
| parent | 55dcdb5051930dee75e9e2c0da90bc82ee3dcd77 (diff) | |
Merge remote-tracking branch 'asoc/topic/pcm' into for-tiwai
Diffstat (limited to 'sound/soc/s6000')
| -rw-r--r-- | sound/soc/s6000/s6000-i2s.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/s6000/s6000-i2s.c b/sound/soc/s6000/s6000-i2s.c index 73bb99f0109a..7eba7979b9af 100644 --- a/sound/soc/s6000/s6000-i2s.c +++ b/sound/soc/s6000/s6000-i2s.c | |||
| @@ -405,8 +405,7 @@ static int s6000_i2s_dai_probe(struct snd_soc_dai *dai) | |||
| 405 | return 0; | 405 | return 0; |
| 406 | } | 406 | } |
| 407 | 407 | ||
| 408 | #define S6000_I2S_RATES (SNDRV_PCM_RATE_CONTINUOUS | SNDRV_PCM_RATE_5512 | \ | 408 | #define S6000_I2S_RATES SNDRV_PCM_RATE_CONTINUOUS |
| 409 | SNDRV_PCM_RATE_8000_192000) | ||
| 410 | #define S6000_I2S_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S32_LE) | 409 | #define S6000_I2S_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S32_LE) |
| 411 | 410 | ||
| 412 | static const struct snd_soc_dai_ops s6000_i2s_dai_ops = { | 411 | static const struct snd_soc_dai_ops s6000_i2s_dai_ops = { |