From 8b7ce26b02b86b1a673e43a72eedff99567a0843 Mon Sep 17 00:00:00 2001
From: Jassi Brar <jassi.brar@samsung.com>
Date: Wed, 10 Mar 2010 16:48:57 +0900
Subject: [PATCH] --- yaml --- r: 193324 b: refs/heads/master c:
 fa6231e1738617a864869600f51c3feb9e1081c8 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/sound/soc/s3c24xx/s3c64xx-i2s.c | 9 ---------
 trunk/sound/soc/s3c24xx/s3c64xx-i2s.h | 9 +++++++++
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 5cc1fdc1cdf1..c128e79ca42f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 87b7eb266c0bcdb5a0f1e670a73f2de742da459f
+refs/heads/master: fa6231e1738617a864869600f51c3feb9e1081c8
diff --git a/trunk/sound/soc/s3c24xx/s3c64xx-i2s.c b/trunk/sound/soc/s3c24xx/s3c64xx-i2s.c
index 39563edabe28..65528943579b 100644
--- a/trunk/sound/soc/s3c24xx/s3c64xx-i2s.c
+++ b/trunk/sound/soc/s3c24xx/s3c64xx-i2s.c
@@ -127,15 +127,6 @@ static int s3c64xx_i2s_probe(struct platform_device *pdev,
 }
 
 
-#define S3C64XX_I2S_RATES \
-	(SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 | SNDRV_PCM_RATE_16000 | \
-	SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | \
-	SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000)
-
-#define S3C64XX_I2S_FMTS \
-	(SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_LE |\
-	 SNDRV_PCM_FMTBIT_S24_LE)
-
 static struct snd_soc_dai_ops s3c64xx_i2s_dai_ops = {
 	.set_sysclk	= s3c64xx_i2s_set_sysclk,	
 };
diff --git a/trunk/sound/soc/s3c24xx/s3c64xx-i2s.h b/trunk/sound/soc/s3c24xx/s3c64xx-i2s.h
index e350d280cd7a..53d2a0a0df36 100644
--- a/trunk/sound/soc/s3c24xx/s3c64xx-i2s.h
+++ b/trunk/sound/soc/s3c24xx/s3c64xx-i2s.h
@@ -27,6 +27,15 @@ struct clk;
 #define S3C64XX_CLKSRC_MUX	S3C_I2SV2_CLKSRC_AUDIOBUS
 #define S3C64XX_CLKSRC_CDCLK    S3C_I2SV2_CLKSRC_CDCLK
 
+#define S3C64XX_I2S_RATES \
+	(SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 | SNDRV_PCM_RATE_16000 | \
+	SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_44100 | \
+	SNDRV_PCM_RATE_48000 | SNDRV_PCM_RATE_88200 | SNDRV_PCM_RATE_96000)
+
+#define S3C64XX_I2S_FMTS \
+	(SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_S16_LE |\
+	 SNDRV_PCM_FMTBIT_S24_LE)
+
 extern struct snd_soc_dai s3c64xx_i2s_dai[];
 
 extern struct clk *s3c64xx_i2s_get_clock(struct snd_soc_dai *dai);