diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-04-16 14:14:35 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-04-16 14:14:35 +0100 |
| commit | 8d98f2246d7c622198ae0b8ca66f1c82b8a25377 (patch) | |
| tree | 6e1dd0347aadc121f6933f070bffd34bb3b33f70 /sound/soc/omap/osk5912.c | |
| parent | 3ba191ce051a32b20757f063120496e860ea8f9d (diff) | |
| parent | 002fbad829883a3ad9b185077f9e54c37dc7502d (diff) | |
Merge branch 'for-2.6.30' into for-2.6.31
Diffstat (limited to 'sound/soc/omap/osk5912.c')
| -rw-r--r-- | sound/soc/omap/osk5912.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/omap/osk5912.c b/sound/soc/omap/osk5912.c index a952a4eb3361..a4e149b7f0eb 100644 --- a/sound/soc/omap/osk5912.c +++ b/sound/soc/omap/osk5912.c @@ -62,7 +62,7 @@ static int osk_hw_params(struct snd_pcm_substream *substream, /* Set codec DAI configuration */ err = snd_soc_dai_set_fmt(codec_dai, SND_SOC_DAIFMT_DSP_B | - SND_SOC_DAIFMT_NB_IF | + SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM); if (err < 0) { printk(KERN_ERR "can't set codec DAI configuration\n"); @@ -72,7 +72,7 @@ static int osk_hw_params(struct snd_pcm_substream *substream, /* Set cpu DAI configuration */ err = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_DSP_B | - SND_SOC_DAIFMT_NB_IF | + SND_SOC_DAIFMT_NB_NF | SND_SOC_DAIFMT_CBM_CFM); if (err < 0) { printk(KERN_ERR "can't set cpu DAI configuration\n"); |