From cb8f24005e901425e61ebe54f58f5233f83f1ee2 Mon Sep 17 00:00:00 2001
From: Graeme Gregory <gg@opensource.wolfsonmicro.com>
Date: Wed, 14 Feb 2007 13:20:46 +0100
Subject: [PATCH] --- yaml --- r: 56096 b: refs/heads/master c:
 86e1f0df2f88fd86657ddb993bba468a75128e02 h: refs/heads/master v: v3

---
 [refs]                           |  2 +-
 trunk/sound/soc/Kconfig          |  1 +
 trunk/sound/soc/Makefile         |  2 +-
 trunk/sound/soc/s3c24xx/Kconfig  | 16 ++++++++++++++++
 trunk/sound/soc/s3c24xx/Makefile |  6 ++++++
 5 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 trunk/sound/soc/s3c24xx/Kconfig
 create mode 100644 trunk/sound/soc/s3c24xx/Makefile

diff --git a/[refs] b/[refs]
index fa7193536b26..d7b123c65f6c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c0f41bb1717ae31f806615e81b808753271dd3d9
+refs/heads/master: 86e1f0df2f88fd86657ddb993bba468a75128e02
diff --git a/trunk/sound/soc/Kconfig b/trunk/sound/soc/Kconfig
index dccaa4be679e..03e04aecd74c 100644
--- a/trunk/sound/soc/Kconfig
+++ b/trunk/sound/soc/Kconfig
@@ -26,6 +26,7 @@ menu "SoC Platforms"
 depends on SND_SOC
 source "sound/soc/at91/Kconfig"
 source "sound/soc/pxa/Kconfig"
+source "sound/soc/s3c24xx/Kconfig"
 endmenu
 
 # Supported codecs
diff --git a/trunk/sound/soc/Makefile b/trunk/sound/soc/Makefile
index 98e6f49dafc2..0ae2e49036f9 100644
--- a/trunk/sound/soc/Makefile
+++ b/trunk/sound/soc/Makefile
@@ -1,4 +1,4 @@
 snd-soc-core-objs := soc-core.o soc-dapm.o
 
 obj-$(CONFIG_SND_SOC)	+= snd-soc-core.o
-obj-$(CONFIG_SND_SOC)	+= codecs/ at91/ pxa/
+obj-$(CONFIG_SND_SOC)	+= codecs/ at91/ pxa/ s3c24xx/
diff --git a/trunk/sound/soc/s3c24xx/Kconfig b/trunk/sound/soc/s3c24xx/Kconfig
new file mode 100644
index 000000000000..433da9f854af
--- /dev/null
+++ b/trunk/sound/soc/s3c24xx/Kconfig
@@ -0,0 +1,16 @@
+menu "SoC Audio for the Samsung S3C24XX"
+
+config SND_S3C24XX_SOC
+	tristate "SoC Audio for the Samsung S3C24XX chips"
+	depends on ARCH_S3C2410 && SND
+	select SND_PCM
+	help
+	  Say Y or M if you want to add support for codecs attached to
+	  the S3C24XX AC97, I2S or SSP interface. You will also need
+	  to select the audio interfaces to support below.
+
+config SND_S3C24XX_SOC_I2S
+	tristate
+
+endmenu
+
diff --git a/trunk/sound/soc/s3c24xx/Makefile b/trunk/sound/soc/s3c24xx/Makefile
new file mode 100644
index 000000000000..6f0fffcb30f5
--- /dev/null
+++ b/trunk/sound/soc/s3c24xx/Makefile
@@ -0,0 +1,6 @@
+# S3c24XX Platform Support
+snd-soc-s3c24xx-objs := s3c24xx-pcm.o
+snd-soc-s3c24xx-i2s-objs := s3c24xx-i2s.o
+
+obj-$(CONFIG_SND_S3C24XX_SOC) += snd-soc-s3c24xx.o
+obj-$(CONFIG_SND_S3C24XX_SOC_I2S) += snd-soc-s3c24xx-i2s.o