aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorRyan Mallon <ryan@bluewatersys.com>2010-11-11 09:02:30 +1300
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-11-11 14:50:13 +0000
commitbbde7814cbc54d6b564d3f65b4b0e82eddef30a6 (patch)
treeca221cfed605cf09b374cfd020b1849ecee226aa /sound
parent0049317edb76d17bfac736b658523c15935391a3 (diff)
downloadkernel_samsung_aries-bbde7814cbc54d6b564d3f65b4b0e82eddef30a6.zip
kernel_samsung_aries-bbde7814cbc54d6b564d3f65b4b0e82eddef30a6.tar.gz
kernel_samsung_aries-bbde7814cbc54d6b564d3f65b4b0e82eddef30a6.tar.bz2
Fix Atmel soc audio boards Kconfig dependency
Add Kconfig dependency on AT91_PROGRAMMABLE_CLOCKS for the Atmel SoC audio SAM9G20-EK and PlayPaq boards. Fixes link errors on missing clk_set_parent and clk_set_rate when building without AT91_PROGRAMMABLE_CLOCKS. Signed-off-by: Ryan Mallon <ryan@bluewatersys.com> Acked-by: Geoffrey Wossum <gwossum@acm.org> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/atmel/Kconfig5
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/atmel/Kconfig b/sound/soc/atmel/Kconfig
index e720d5e..bee3c94 100644
--- a/sound/soc/atmel/Kconfig
+++ b/sound/soc/atmel/Kconfig
@@ -16,7 +16,8 @@ config SND_ATMEL_SOC_SSC
config SND_AT91_SOC_SAM9G20_WM8731
tristate "SoC Audio support for WM8731-based At91sam9g20 evaluation board"
- depends on ATMEL_SSC && ARCH_AT91SAM9G20 && SND_ATMEL_SOC
+ depends on ATMEL_SSC && ARCH_AT91SAM9G20 && SND_ATMEL_SOC && \
+ AT91_PROGRAMMABLE_CLOCKS
select SND_ATMEL_SOC_SSC
select SND_SOC_WM8731
help
@@ -25,7 +26,7 @@ config SND_AT91_SOC_SAM9G20_WM8731
config SND_AT32_SOC_PLAYPAQ
tristate "SoC Audio support for PlayPaq with WM8510"
- depends on SND_ATMEL_SOC && BOARD_PLAYPAQ
+ depends on SND_ATMEL_SOC && BOARD_PLAYPAQ && AT91_PROGRAMMABLE_CLOCKS
select SND_ATMEL_SOC_SSC
select SND_SOC_WM8510
help