diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-05-15 15:38:26 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-05-15 15:38:26 +0200 |
| commit | 60befb97f5ab11037f1ae7563ca7137878a7bd46 (patch) | |
| tree | 135fd84011d6f75eccbb7647c9b03957a800ed99 /sound/soc/davinci/Kconfig | |
| parent | a3d2b755c0e8f301c079d8aa5a761622259400fe (diff) | |
| parent | f492ec9f02908579353e31949855f86909a5af14 (diff) | |
Merge branch 'fix/asoc' into for-linus
* fix/asoc:
ASoC: DaVinci EVM board support buildfixes
ASoC: DaVinci I2S updates
ASoC: davinci-pcm buildfixes
pxa2xx-ac97: fix reset gpio mode setting
ASoC: soc-core: fix crash when removing not instantiated card
Diffstat (limited to 'sound/soc/davinci/Kconfig')
| -rw-r--r-- | sound/soc/davinci/Kconfig | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/soc/davinci/Kconfig b/sound/soc/davinci/Kconfig index bd7392c9657..411a710be66 100644 --- a/sound/soc/davinci/Kconfig +++ b/sound/soc/davinci/Kconfig @@ -10,13 +10,14 @@ config SND_DAVINCI_SOC_I2S tristate config SND_DAVINCI_SOC_EVM - tristate "SoC Audio support for DaVinci EVM" - depends on SND_DAVINCI_SOC && MACH_DAVINCI_EVM + tristate "SoC Audio support for DaVinci DM6446 or DM355 EVM" + depends on SND_DAVINCI_SOC + depends on MACH_DAVINCI_EVM || MACH_DAVINCI_DM355_EVM select SND_DAVINCI_SOC_I2S select SND_SOC_TLV320AIC3X help Say Y if you want to add support for SoC audio on TI - DaVinci EVM platform. + DaVinci DM6446 or DM355 EVM platforms. config SND_DAVINCI_SOC_SFFSDR tristate "SoC Audio support for SFFSDR" |