diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-13 13:06:58 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-13 13:06:58 -0400 |
| commit | be3bfbba8f7f6c8f32e8444ef895433701a3f801 (patch) | |
| tree | dfd00be7d15dbf8353f188f2505426411cb18d06 /sound/soc/at91/Kconfig | |
| parent | 20272c8994cf1e1f8ed745a2ea161dd9ad3889f2 (diff) | |
| parent | 7dc85076f83253fcffae99e6d5e6ce77840f8841 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (33 commits)
ALSA: ASoC codec: remove unused #include <version.h>
ALSA: ASoC: update email address for Liam Girdwood
ALSA: hda: corrected invalid mixer values
ALSA: hda: add mixers for analog mixer on 92hd75xx codecs
ALSA: ASoC: Add destination and source port for DMA on OMAP1
ALSA: ASoC: Drop device registration from GTA01 lm4857 driver
ALSA: ASoC: Fix build of GTA01 audio driver
ALSA: ASoC: Add widgets before setting endpoints on GTA01
ALSA: ASoC: Fix inverted input PGA mute bits in WM8903
ALSA: ASoC: OMAP: Set DMA stream name at runtime in McBSP DAI driver
ALSA: ASoC: OMAP: Add support for OMAP2430 and OMAP34xx in McBSP DAI driver
ALSA: ASoC: OMAP: Add multilink support to McBSP DAI driver
ALSA: ASoC: Make TLV320AIC26 user-visible
ALSA: ASoC - clean up Kconfig for TLV320AIC2
ALSA: ASoC: Make WM8510 microphone input a DAPM mixer
ALSA: ASoC: Implement WM8510 bias level control
ALSA: ASoC: Remove unused AUDIO_NAME define from codec drivers
ALSA: ASoC: tlv320aic3x: Use uniform tlv320aic naming
ALSA: ASoC: Add WM8510 SPI support
ALSA: ASoC: Add WM8753 SPI support
...
Diffstat (limited to 'sound/soc/at91/Kconfig')
| -rw-r--r-- | sound/soc/at91/Kconfig | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/sound/soc/at91/Kconfig b/sound/soc/at91/Kconfig index 905186502e00..85a883299c2e 100644 --- a/sound/soc/at91/Kconfig +++ b/sound/soc/at91/Kconfig | |||
| @@ -8,20 +8,3 @@ config SND_AT91_SOC | |||
| 8 | 8 | ||
| 9 | config SND_AT91_SOC_SSC | 9 | config SND_AT91_SOC_SSC |
| 10 | tristate | 10 | tristate |
| 11 | |||
| 12 | config SND_AT91_SOC_ETI_B1_WM8731 | ||
| 13 | tristate "SoC Audio support for WM8731-based Endrelia ETI-B1 boards" | ||
| 14 | depends on SND_AT91_SOC && (MACH_ETI_B1 || MACH_ETI_C1) | ||
| 15 | select SND_AT91_SOC_SSC | ||
| 16 | select SND_SOC_WM8731 | ||
| 17 | help | ||
| 18 | Say Y if you want to add support for SoC audio on WM8731-based | ||
| 19 | Endrelia Technologies Inc ETI-B1 or ETI-C1 boards. | ||
| 20 | |||
| 21 | config SND_AT91_SOC_ETI_SLAVE | ||
| 22 | bool "Run codec in slave Mode on Endrelia boards" | ||
| 23 | depends on SND_AT91_SOC_ETI_B1_WM8731 | ||
| 24 | default n | ||
| 25 | help | ||
| 26 | Say Y if you want to run with the AT91 SSC generating the BCLK | ||
| 27 | and LRC signals on Endrelia boards. | ||