diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-06-25 13:58:37 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-06-25 13:58:37 +0100 |
| commit | d5fc3b5fe374f24b6773c22e90ef4bdda718b845 (patch) | |
| tree | 3d8f2cfe059e418ad7eb37ababbc2f2cafe213c6 /sound/soc/pxa | |
| parent | e2f551dacbdff8e40365a989ab66104b03316f4d (diff) | |
| parent | dd5e8e6b1d4c218d2bafe002231ec460459ab5c4 (diff) | |
Merge branch 'for-2.6.31' into for-2.6.32
Diffstat (limited to 'sound/soc/pxa')
| -rw-r--r-- | sound/soc/pxa/magician.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/pxa/magician.c b/sound/soc/pxa/magician.c index 9fe4ad20615..8889cd37160 100644 --- a/sound/soc/pxa/magician.c +++ b/sound/soc/pxa/magician.c @@ -186,7 +186,7 @@ static int magician_playback_hw_params(struct snd_pcm_substream *substream, /* set cpu DAI configuration */ ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_DSP_A | - SND_SOC_DAIFMT_IB_IF | SND_SOC_DAIFMT_CBS_CFS); + SND_SOC_DAIFMT_NB_IF | SND_SOC_DAIFMT_CBS_CFS); if (ret < 0) return ret; |