Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:
	arch/sh/include/asm/Kbuild
	drivers/Makefile

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

1 files changed, 20 insertions, 0 deletions

diff --git a/sound/soc/kirkwood/Kconfig b/sound/soc/kirkwood/Kconfig
new file mode 100644
index 000000000000..16ec2a2dba4d
--- /dev/null
+++ b/sound/soc/kirkwood/Kconfig
@@ -0,0 +1,20 @@
+config SND_KIRKWOOD_SOC
+        tristate "SoC Audio for the Marvell Kirkwood chip"
+        depends on ARCH_KIRKWOOD
+        help
+          Say Y or M if you want to add support for codecs attached to
+          the Kirkwood I2S interface. You will also need to select the
+          audio interfaces to support below.
+
+config SND_KIRKWOOD_SOC_I2S
+        tristate
+
+config SND_KIRKWOOD_SOC_OPENRD
+        tristate "SoC Audio support for Kirkwood Openrd Client"
+        depends on SND_KIRKWOOD_SOC && MACH_OPENRD_CLIENT
+        select SND_KIRKWOOD_SOC_I2S
+        select SND_SOC_CS42L51
+        help
+          Say Y if you want to add support for SoC audio on
+          Openrd Client.
+