diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-04-26 19:36:14 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-04-26 19:36:17 +0200 |
| commit | 7bd5fafeb414cf00deee32c82834f8bf1426b9ac (patch) | |
| tree | 1103053fa40576e9f9fc2818ea1910180e09b752 /sound/soc/samsung/pcm.c | |
| parent | fa7b69475a6c192853949ba496dd9c37b497b548 (diff) | |
| parent | ec75a71634dabe439db91c1ef51d5099f4493808 (diff) | |
| download | op-kernel-dev-7bd5fafeb414cf00deee32c82834f8bf1426b9ac.zip op-kernel-dev-7bd5fafeb414cf00deee32c82834f8bf1426b9ac.tar.gz | |
Merge branch 'perf/urgent' into perf/stat
Merge reason: We want to queue up dependent changes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'sound/soc/samsung/pcm.c')
| -rw-r--r-- | sound/soc/samsung/pcm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/samsung/pcm.c b/sound/soc/samsung/pcm.c index 38aac7d..9c7e8b4 100644 --- a/sound/soc/samsung/pcm.c +++ b/sound/soc/samsung/pcm.c @@ -350,8 +350,8 @@ static int s3c_pcm_set_fmt(struct snd_soc_dai *cpu_dai, ctl = readl(regs + S3C_PCM_CTL); switch (fmt & SND_SOC_DAIFMT_INV_MASK) { - case SND_SOC_DAIFMT_NB_NF: - /* Nothing to do, NB_NF by default */ + case SND_SOC_DAIFMT_IB_NF: + /* Nothing to do, IB_NF by default */ break; default: dev_err(pcm->dev, "Unsupported clock inversion!\n"); |
