Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 6 insertions, 0 deletions

diff --git a/sound/soc/ep93xx/Makefile b/sound/soc/ep93xx/Makefile
index 272e60f57b9a..5514146cbdf0 100644
--- a/sound/soc/ep93xx/Makefile
+++ b/sound/soc/ep93xx/Makefile
@@ -1,11 +1,17 @@
 # EP93xx Platform Support
 snd-soc-ep93xx-objs                             := ep93xx-pcm.o
 snd-soc-ep93xx-i2s-objs                         := ep93xx-i2s.o
+snd-soc-ep93xx-ac97-objs                        := ep93xx-ac97.o
 
 obj-$(CONFIG_SND_EP93XX_SOC)                    += snd-soc-ep93xx.o
 obj-$(CONFIG_SND_EP93XX_SOC_I2S)                += snd-soc-ep93xx-i2s.o
+obj-$(CONFIG_SND_EP93XX_SOC_AC97)               += snd-soc-ep93xx-ac97.o
 
 # EP93XX Machine Support
 snd-soc-snappercl15-objs                        := snappercl15.o
+snd-soc-simone-objs                             := simone.o
+snd-soc-edb93xx-objs                            := edb93xx.o
 
 obj-$(CONFIG_SND_EP93XX_SOC_SNAPPERCL15)        += snd-soc-snappercl15.o
+obj-$(CONFIG_SND_EP93XX_SOC_SIMONE)             += snd-soc-simone.o
+obj-$(CONFIG_SND_EP93XX_SOC_EDB93XX)            += snd-soc-edb93xx.o