2 files changed, 13 insertions, 10 deletions

diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig
index 95c12b26fe37..c7c78c39cfed 100644
--- a/sound/soc/fsl/Kconfig
+++ b/sound/soc/fsl/Kconfig
@@ -1,17 +1,17 @@
 config SND_SOC_OF_SIMPLE
         tristate
 
+# ASoC platform support for the Freescale MPC8610 SOC.  This compiles drivers
+# for the SSI and the Elo DMA controller.  You will still need to select
+# a platform driver and a codec driver.
 config SND_SOC_MPC8610
-        bool "ALSA SoC support for the MPC8610 SOC"
-        depends on MPC8610_HPCD
-        default y if MPC8610
-        help
-          Say Y if you want to add support for codecs attached to the SSI
-          device on an MPC8610.
+        tristate
+        depends on MPC8610
 
 config SND_SOC_MPC8610_HPCD
-        bool "ALSA SoC support for the Freescale MPC8610 HPCD board"
-        depends on SND_SOC_MPC8610
+        tristate "ALSA SoC support for the Freescale MPC8610 HPCD board"
+        depends on MPC8610_HPCD
+        select SND_SOC_MPC8610
         select SND_SOC_CS4270
         select SND_SOC_CS4270_VD33_ERRATA
         default y if MPC8610_HPCD
diff --git a/sound/soc/fsl/Makefile b/sound/soc/fsl/Makefile
index 035da4afec34..f85134c86387 100644
--- a/sound/soc/fsl/Makefile
+++ b/sound/soc/fsl/Makefile
@@ -2,10 +2,13 @@
 obj-$(CONFIG_SND_SOC_OF_SIMPLE) += soc-of-simple.o
 
 # MPC8610 HPCD Machine Support
-obj-$(CONFIG_SND_SOC_MPC8610_HPCD) += mpc8610_hpcd.o
+snd-soc-mpc8610-hpcd-objs := mpc8610_hpcd.o
+obj-$(CONFIG_SND_SOC_MPC8610_HPCD) += snd-soc-mpc8610-hpcd.o
 
 # MPC8610 Platform Support
-obj-$(CONFIG_SND_SOC_MPC8610) += fsl_ssi.o fsl_dma.o
+snd-soc-fsl-ssi-objs := fsl_ssi.o
+snd-soc-fsl-dma-objs := fsl_dma.o
+obj-$(CONFIG_SND_SOC_MPC8610) += snd-soc-fsl-ssi.o snd-soc-fsl-dma.o
 
 obj-$(CONFIG_SND_SOC_MPC5200_I2S) += mpc5200_psc_i2s.o