diff options
| author | Mark Brown <broonie@linaro.org> | 2014-06-01 14:02:07 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-06-01 14:02:07 +0100 |
| commit | 287d414eacaa681413ea89adfa5b3a0d12d2ab1a (patch) | |
| tree | a4ef6c55bc2b2177f8a4144663c68e6e345b64cc /sound/soc/fsl/imx-pcm-dma.c | |
| parent | 432481220101166a0b33dc6f951b38a8af3d281c (diff) | |
| parent | 7b8751abdd34a2f924c37c29ad61d598f5d29e7b (diff) | |
Merge branch 'topic/fsl' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-fsl-ssi
Conflicts:
sound/soc/fsl/Kconfig
Diffstat (limited to 'sound/soc/fsl/imx-pcm-dma.c')
| -rw-r--r-- | sound/soc/fsl/imx-pcm-dma.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sound/soc/fsl/imx-pcm-dma.c b/sound/soc/fsl/imx-pcm-dma.c index 2585ae44e634..0849b7b83f0a 100644 --- a/sound/soc/fsl/imx-pcm-dma.c +++ b/sound/soc/fsl/imx-pcm-dma.c @@ -40,7 +40,6 @@ static const struct snd_pcm_hardware imx_pcm_hardware = { SNDRV_PCM_INFO_MMAP_VALID | SNDRV_PCM_INFO_PAUSE | SNDRV_PCM_INFO_RESUME, - .formats = SNDRV_PCM_FMTBIT_S16_LE, .buffer_bytes_max = IMX_SSI_DMABUF_SIZE, .period_bytes_min = 128, .period_bytes_max = 65535, /* Limited by SDMA engine */ |