diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-12-01 18:02:53 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-12-01 18:02:53 +0100 |
| commit | 1042c248c6d40bfa70249fe54de519d2264c9738 (patch) | |
| tree | eae7d6a38512852e2a9f89763572e087ad2ed36d /sound | |
| parent | 55ed1934560ed76c574f8239dd27d2675cd88595 (diff) | |
| parent | 2caf6a1f9c8bcdc81ba580cfbf512d073c9444be (diff) | |
Merge branch 'topic/asoc' into for-next
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/blackfin/Kconfig | 4 | ||||
| -rw-r--r-- | sound/soc/fsl/Kconfig | 3 | ||||
| -rw-r--r-- | sound/soc/omap/Kconfig | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/sound/soc/blackfin/Kconfig b/sound/soc/blackfin/Kconfig index e162cbbd3f3b..0a2f8f9eff53 100644 --- a/sound/soc/blackfin/Kconfig +++ b/sound/soc/blackfin/Kconfig @@ -1,6 +1,6 @@ config SND_BF5XX_I2S tristate "SoC I2S Audio for the ADI BF5xx chip" - depends on BLACKFIN && SND_SOC + depends on BLACKFIN help Say Y or M if you want to add support for codecs attached to the Blackfin SPORT (synchronous serial ports) interface in I2S @@ -34,7 +34,7 @@ config SND_BFIN_AD73311_SE config SND_BF5XX_AC97 tristate "SoC AC97 Audio for the ADI BF5xx chip" - depends on BLACKFIN && SND_SOC + depends on BLACKFIN help Say Y or M if you want to add support for codecs attached to the Blackfin SPORT (synchronous serial ports) interface in slot 16 diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig index bba9546ba5f5..95c12b26fe37 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 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. diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig index 9a869390abb9..da39f27c6613 100644 --- a/sound/soc/omap/Kconfig +++ b/sound/soc/omap/Kconfig @@ -1,6 +1,6 @@ config SND_OMAP_SOC tristate "SoC Audio for the Texas Instruments OMAP chips" - depends on ARCH_OMAP && SND_SOC + depends on ARCH_OMAP config SND_OMAP_SOC_MCBSP tristate |