diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /sound/soc/atmel/Kconfig | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'sound/soc/atmel/Kconfig')
| -rw-r--r-- | sound/soc/atmel/Kconfig | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sound/soc/atmel/Kconfig b/sound/soc/atmel/Kconfig index e720d5e6f04c..bee3c94f58b0 100644 --- a/sound/soc/atmel/Kconfig +++ b/sound/soc/atmel/Kconfig | |||
| @@ -16,7 +16,8 @@ config SND_ATMEL_SOC_SSC | |||
| 16 | 16 | ||
| 17 | config SND_AT91_SOC_SAM9G20_WM8731 | 17 | config SND_AT91_SOC_SAM9G20_WM8731 |
| 18 | tristate "SoC Audio support for WM8731-based At91sam9g20 evaluation board" | 18 | tristate "SoC Audio support for WM8731-based At91sam9g20 evaluation board" |
| 19 | depends on ATMEL_SSC && ARCH_AT91SAM9G20 && SND_ATMEL_SOC | 19 | depends on ATMEL_SSC && ARCH_AT91SAM9G20 && SND_ATMEL_SOC && \ |
| 20 | AT91_PROGRAMMABLE_CLOCKS | ||
| 20 | select SND_ATMEL_SOC_SSC | 21 | select SND_ATMEL_SOC_SSC |
| 21 | select SND_SOC_WM8731 | 22 | select SND_SOC_WM8731 |
| 22 | help | 23 | help |
| @@ -25,7 +26,7 @@ config SND_AT91_SOC_SAM9G20_WM8731 | |||
| 25 | 26 | ||
| 26 | config SND_AT32_SOC_PLAYPAQ | 27 | config SND_AT32_SOC_PLAYPAQ |
| 27 | tristate "SoC Audio support for PlayPaq with WM8510" | 28 | tristate "SoC Audio support for PlayPaq with WM8510" |
| 28 | depends on SND_ATMEL_SOC && BOARD_PLAYPAQ | 29 | depends on SND_ATMEL_SOC && BOARD_PLAYPAQ && AT91_PROGRAMMABLE_CLOCKS |
| 29 | select SND_ATMEL_SOC_SSC | 30 | select SND_ATMEL_SOC_SSC |
| 30 | select SND_SOC_WM8510 | 31 | select SND_SOC_WM8510 |
| 31 | help | 32 | help |