diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-05-23 18:18:40 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-05-23 18:18:40 -0400 |
| commit | fc05505b77f7900a1bb74fb3f3a4343dee4265a4 (patch) | |
| tree | 6517919cb60bd9465078512cacbefd8c77f94b76 /sound/soc/davinci/Kconfig | |
| parent | a2ab67fae1ab9226679495a8d260f4e6555efc5f (diff) | |
| parent | 11c79740d3c03cb81f84e98cf2e2dbd8d9bb53cd (diff) | |
Merge branch 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6 into devel
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 | |||
| 10 | tristate | 10 | tristate |
| 11 | 11 | ||
| 12 | config SND_DAVINCI_SOC_EVM | 12 | config SND_DAVINCI_SOC_EVM |
| 13 | tristate "SoC Audio support for DaVinci EVM" | 13 | tristate "SoC Audio support for DaVinci DM6446 or DM355 EVM" |
| 14 | depends on SND_DAVINCI_SOC && MACH_DAVINCI_EVM | 14 | depends on SND_DAVINCI_SOC |
| 15 | depends on MACH_DAVINCI_EVM || MACH_DAVINCI_DM355_EVM | ||
| 15 | select SND_DAVINCI_SOC_I2S | 16 | select SND_DAVINCI_SOC_I2S |
| 16 | select SND_SOC_TLV320AIC3X | 17 | select SND_SOC_TLV320AIC3X |
| 17 | help | 18 | help |
| 18 | Say Y if you want to add support for SoC audio on TI | 19 | Say Y if you want to add support for SoC audio on TI |
| 19 | DaVinci EVM platform. | 20 | DaVinci DM6446 or DM355 EVM platforms. |
| 20 | 21 | ||
| 21 | config SND_DAVINCI_SOC_SFFSDR | 22 | config SND_DAVINCI_SOC_SFFSDR |
| 22 | tristate "SoC Audio support for SFFSDR" | 23 | tristate "SoC Audio support for SFFSDR" |