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, 11 insertions, 0 deletions

diff --git a/sound/soc/ep93xx/Makefile b/sound/soc/ep93xx/Makefile
new file mode 100644
index 000000000000..272e60f57b9a
--- /dev/null
+++ b/sound/soc/ep93xx/Makefile
@@ -0,0 +1,11 @@
+# EP93xx Platform Support
+snd-soc-ep93xx-objs                             := ep93xx-pcm.o
+snd-soc-ep93xx-i2s-objs                         := ep93xx-i2s.o
+
+obj-$(CONFIG_SND_EP93XX_SOC)                    += snd-soc-ep93xx.o
+obj-$(CONFIG_SND_EP93XX_SOC_I2S)                += snd-soc-ep93xx-i2s.o
+
+# EP93XX Machine Support
+snd-soc-snappercl15-objs                        := snappercl15.o
+
+obj-$(CONFIG_SND_EP93XX_SOC_SNAPPERCL15)        += snd-soc-snappercl15.o