diff options
| author | Chris Mason <clm@fb.com> | 2014-12-02 18:42:03 -0800 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2014-12-02 18:42:03 -0800 |
| commit | 9627aeee3e203e30679549e4962633698a6bf87f (patch) | |
| tree | 30ee313a7049bf3fcc17e346df5737e967fd9a95 /sound/soc/sh/fsi.c | |
| parent | cb83b7b81698a4abe531e0ba18b9e288b06947ce (diff) | |
| parent | 5d3edd8f44aac94de7b16f4c54290e24f5e8c532 (diff) | |
Merge branch 'raid56-scrub-replace' of git://github.com/miaoxie/linux-btrfs into for-linus
Diffstat (limited to 'sound/soc/sh/fsi.c')
| -rw-r--r-- | sound/soc/sh/fsi.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/sh/fsi.c b/sound/soc/sh/fsi.c index 66fddec9543d..88e5df474ccf 100644 --- a/sound/soc/sh/fsi.c +++ b/sound/soc/sh/fsi.c @@ -1711,8 +1711,7 @@ static const struct snd_soc_dai_ops fsi_dai_ops = { static struct snd_pcm_hardware fsi_pcm_hardware = { .info = SNDRV_PCM_INFO_INTERLEAVED | SNDRV_PCM_INFO_MMAP | - SNDRV_PCM_INFO_MMAP_VALID | - SNDRV_PCM_INFO_PAUSE, + SNDRV_PCM_INFO_MMAP_VALID, .buffer_bytes_max = 64 * 1024, .period_bytes_min = 32, .period_bytes_max = 8192, |