summaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2010-11-11 16:00:49 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-11-11 16:00:49 +0000
commit5cdc5c3e6e13ed0631812245332f8f7a25a1a4b7 (patch)
tree512f0ad0b1d75e923c3b2d9b9d07413b7d95a6ca /sound/soc
parenta7f387d5afd5e1102f909ab611370014f1f59ae2 (diff)
parentbbde7814cbc54d6b564d3f65b4b0e82eddef30a6 (diff)
downloadop-kernel-dev-5cdc5c3e6e13ed0631812245332f8f7a25a1a4b7.zip
op-kernel-dev-5cdc5c3e6e13ed0631812245332f8f7a25a1a4b7.tar.gz
Merge branch 'for-2.6.37' into for-2.6.38
Diffstat (limited to 'sound/soc')
-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
OpenPOWER on IntegriCloud