From 00ec3fafbf18b6c75955bff25e05719c812ca166 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@rpsys.net>
Date: Fri, 6 Oct 2006 18:38:37 +0200
Subject: [PATCH] --- yaml --- r: 47052 b: refs/heads/master c:
 7f137ab673124ee0a210ab5b74c1f7234d6145fa h: refs/heads/master v: v3

---
 [refs]                          |  2 +-
 trunk/sound/soc/Kconfig         |  6 ++++++
 trunk/sound/soc/Makefile        |  2 +-
 trunk/sound/soc/codecs/Kconfig  | 15 +++++++++++++++
 trunk/sound/soc/codecs/Makefile |  9 +++++++++
 5 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 trunk/sound/soc/codecs/Kconfig
 create mode 100644 trunk/sound/soc/codecs/Makefile

diff --git a/[refs] b/[refs]
index 6ab6ab425d16..aaec116c5bad 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dbc6b6ad767c86907db373e85139b0e975ba7599
+refs/heads/master: 7f137ab673124ee0a210ab5b74c1f7234d6145fa
diff --git a/trunk/sound/soc/Kconfig b/trunk/sound/soc/Kconfig
index 200709f4b708..288bad30b213 100644
--- a/trunk/sound/soc/Kconfig
+++ b/trunk/sound/soc/Kconfig
@@ -5,6 +5,9 @@
 menu "SoC audio support"
 	depends on SND!=n
 
+config SND_SOC_AC97_BUS
+	bool
+
 config SND_SOC
 	tristate "SoC audio support"
 	---help---
@@ -16,4 +19,7 @@ config SND_SOC
 	  This SoC audio support can also be built as a module.  If so, the module
 	  will be called snd-soc-core.
 
+# Supported codecs
+source "sound/soc/codecs/Kconfig"
+
 endmenu
diff --git a/trunk/sound/soc/Makefile b/trunk/sound/soc/Makefile
index b211ee63fd76..3dd4f20c5ecf 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/
diff --git a/trunk/sound/soc/codecs/Kconfig b/trunk/sound/soc/codecs/Kconfig
new file mode 100644
index 000000000000..78ac2688e124
--- /dev/null
+++ b/trunk/sound/soc/codecs/Kconfig
@@ -0,0 +1,15 @@
+config SND_SOC_AC97_CODEC
+	tristate
+	depends SND_SOC
+
+config SND_SOC_WM8731
+	tristate
+	depends SND_SOC
+
+config SND_SOC_WM8750
+	tristate
+	depends SND_SOC
+
+config SND_SOC_WM9712
+	tristate
+	depends SND_SOC
diff --git a/trunk/sound/soc/codecs/Makefile b/trunk/sound/soc/codecs/Makefile
new file mode 100644
index 000000000000..3249a6e4f1d0
--- /dev/null
+++ b/trunk/sound/soc/codecs/Makefile
@@ -0,0 +1,9 @@
+snd-soc-ac97-objs := ac97.o
+snd-soc-wm8731-objs := wm8731.o
+snd-soc-wm8750-objs := wm8750.o
+snd-soc-wm9712-objs := wm9712.o
+
+obj-$(CONFIG_SND_SOC_AC97_CODEC)	+= snd-soc-ac97.o
+obj-$(CONFIG_SND_SOC_WM8731)	+= snd-soc-wm8731.o
+obj-$(CONFIG_SND_SOC_WM8750)	+= snd-soc-wm8750.o
+obj-$(CONFIG_SND_SOC_WM9712)	+= snd-soc-wm9712.o