From c53e87d55fa09a0b757e0929c0d62a67d4ea12f9 Mon Sep 17 00:00:00 2001
From: Roel Kluin <12o3l@tiscali.nl>
Date: Fri, 22 Feb 2008 18:41:41 +0100
Subject: [PATCH] --- yaml --- r: 86161 b: refs/heads/master c:
 e5c21571361d951888c26c6ed1a21047e14b5e71 h: refs/heads/master i:   86159:
 f28458ebf100b8cd4a471c595b6d19e750db8b9f v: v3

---
 [refs]                             | 2 +-
 trunk/sound/soc/fsl/mpc8610_hpcd.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index f2188b24bfe6..dc2579063233 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 902b05c117c33c50075b21c293bf60958dedb92d
+refs/heads/master: e5c21571361d951888c26c6ed1a21047e14b5e71
diff --git a/trunk/sound/soc/fsl/mpc8610_hpcd.c b/trunk/sound/soc/fsl/mpc8610_hpcd.c
index f26c4b2e8b6e..a00aac7a71f1 100644
--- a/trunk/sound/soc/fsl/mpc8610_hpcd.c
+++ b/trunk/sound/soc/fsl/mpc8610_hpcd.c
@@ -315,7 +315,7 @@ static int mpc8610_hpcd_probe(struct of_device *ofdev,
 		machine_data->dai_format = SND_SOC_DAIFMT_LEFT_J;
 		machine_data->codec_clk_direction = SND_SOC_CLOCK_IN;
 		machine_data->cpu_clk_direction = SND_SOC_CLOCK_OUT;
-	} else if (strcasecmp(sprop, "rj-master") == 0) {
+	} else if (strcasecmp(sprop, "rj-slave") == 0) {
 		machine_data->dai_format = SND_SOC_DAIFMT_RIGHT_J;
 		machine_data->codec_clk_direction = SND_SOC_CLOCK_OUT;
 		machine_data->cpu_clk_direction = SND_SOC_CLOCK_IN;