aboutsummaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorPaul Mackerras2008-11-24 11:53:44 +1100
committerPaul Mackerras2008-11-24 11:53:44 +1100
commit11bac8a026dd38380b52a914ec9bf65fb2ad13e2 (patch)
tree16ad0b9cb3e74383062ed664733494633bbd43a7 /sound
parente871809cccc11aaa072afaf746f8fd946d2d9cac (diff)
parentc8d698849e135780738c2cb08f07f06eda982a8c (diff)
Merge branch 'merge' of git://git.secretlab.ca/git/linux-2.6-mpc52xx into merge
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/fsl/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig
index bba9546ba5f5..8d73edc56102 100644
--- a/sound/soc/fsl/Kconfig
+++ b/sound/soc/fsl/Kconfig
@@ -20,7 +20,8 @@ config SND_SOC_MPC8610_HPCD
config SND_SOC_MPC5200_I2S
tristate "Freescale MPC5200 PSC in I2S mode driver"
+ depends on SND_SOC && PPC_MPC52xx && PPC_BESTCOMM
select SND_SOC_OF_SIMPLE
- depends on SND_SOC && PPC_MPC52xx
+ select PPC_BESTCOMM_GEN_BD
help
Say Y here to support the MPC5200 PSCs in I2S mode.