diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-01-13 02:37:24 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-01-13 02:37:24 -0500 |
| commit | 6db9a0f326d3144d790d9479309df480a8f562e4 (patch) | |
| tree | 650a8950c35c087278ecee1b8d123f75f601ebc8 /sound/soc/sh/fsi-da7210.c | |
| parent | c400c9e23feb5bb3fbe8a8d4581ecce3b19a2f38 (diff) | |
| parent | 18b022eb117e7f70c191267551ff865f278a9258 (diff) | |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'sound/soc/sh/fsi-da7210.c')
| -rw-r--r-- | sound/soc/sh/fsi-da7210.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/sh/fsi-da7210.c b/sound/soc/sh/fsi-da7210.c index a6adb6e43250..e8df9da92f71 100644 --- a/sound/soc/sh/fsi-da7210.c +++ b/sound/soc/sh/fsi-da7210.c | |||
| @@ -18,7 +18,7 @@ static int fsi_da7210_init(struct snd_soc_pcm_runtime *rtd) | |||
| 18 | struct snd_soc_dai *dai = rtd->codec_dai; | 18 | struct snd_soc_dai *dai = rtd->codec_dai; |
| 19 | 19 | ||
| 20 | return snd_soc_dai_set_fmt(dai, | 20 | return snd_soc_dai_set_fmt(dai, |
| 21 | SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF | | 21 | SND_SOC_DAIFMT_I2S | |
| 22 | SND_SOC_DAIFMT_CBM_CFM); | 22 | SND_SOC_DAIFMT_CBM_CFM); |
| 23 | } | 23 | } |
| 24 | 24 | ||