From c4697c005fd2c90990c98b884df5e2ffcf401f81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Gl=C3=B6ckner?= <dg@emlix.com>
Date: Mon, 6 Apr 2009 11:50:22 +0200
Subject: [PATCH] --- yaml --- r: 148180 b: refs/heads/master c:
 80fbe6ac9b47cbc11e174a9bf853834dc281da35 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/sound/soc/s6000/s6000-i2s.c   | 4 ++--
 trunk/sound/soc/s6000/s6105-ipcam.c | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 47bbad670138..759c2d7cc4e3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b7dbbe0c9491e62b50978d1615193bec33a8291
+refs/heads/master: 80fbe6ac9b47cbc11e174a9bf853834dc281da35
diff --git a/trunk/sound/soc/s6000/s6000-i2s.c b/trunk/sound/soc/s6000/s6000-i2s.c
index dcc79040bdac..c5cda187ecab 100644
--- a/trunk/sound/soc/s6000/s6000-i2s.c
+++ b/trunk/sound/soc/s6000/s6000-i2s.c
@@ -252,10 +252,10 @@ static int s6000_i2s_set_dai_fmt(struct snd_soc_dai *cpu_dai,
 	}
 
 	switch (fmt & SND_SOC_DAIFMT_INV_MASK) {
-	case SND_SOC_DAIFMT_IB_IF:
+	case SND_SOC_DAIFMT_NB_NF:
 		w |= S6_I2S_LEFT_FIRST;
 		break;
-	case SND_SOC_DAIFMT_IB_NF:
+	case SND_SOC_DAIFMT_NB_IF:
 		w |= S6_I2S_RIGHT_FIRST;
 		break;
 	default:
diff --git a/trunk/sound/soc/s6000/s6105-ipcam.c b/trunk/sound/soc/s6000/s6105-ipcam.c
index 21c4f55106ca..b5f95f9781c1 100644
--- a/trunk/sound/soc/s6000/s6105-ipcam.c
+++ b/trunk/sound/soc/s6000/s6105-ipcam.c
@@ -43,7 +43,7 @@ static int s6105_hw_params(struct snd_pcm_substream *substream,
 
 	/* set cpu DAI configuration */
 	ret = snd_soc_dai_set_fmt(cpu_dai, SND_SOC_DAIFMT_CBM_CFM |
-					   SND_SOC_DAIFMT_IB_IF);
+					   SND_SOC_DAIFMT_NB_NF);
 	if (ret < 0)
 		return ret;