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/codecs/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/codecs/Kconfig')
| -rw-r--r-- | sound/soc/codecs/Kconfig | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig index e0b9869df0f1..4975d8573e4f 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig | |||
| @@ -3,9 +3,11 @@ config SND_SOC_ALL_CODECS | |||
| 3 | depends on I2C | 3 | depends on I2C |
| 4 | select SPI | 4 | select SPI |
| 5 | select SPI_MASTER | 5 | select SPI_MASTER |
| 6 | select SND_SOC_AD73311 | ||
| 6 | select SND_SOC_AK4535 | 7 | select SND_SOC_AK4535 |
| 7 | select SND_SOC_CS4270 | 8 | select SND_SOC_CS4270 |
| 8 | select SND_SOC_SSM2602 | 9 | select SND_SOC_SSM2602 |
| 10 | select SND_SOC_TLV320AIC23 | ||
| 9 | select SND_SOC_TLV320AIC26 | 11 | select SND_SOC_TLV320AIC26 |
| 10 | select SND_SOC_TLV320AIC3X | 12 | select SND_SOC_TLV320AIC3X |
| 11 | select SND_SOC_UDA1380 | 13 | select SND_SOC_UDA1380 |
| @@ -34,6 +36,9 @@ config SND_SOC_AC97_CODEC | |||
| 34 | config SND_SOC_AD1980 | 36 | config SND_SOC_AD1980 |
| 35 | tristate | 37 | tristate |
| 36 | 38 | ||
| 39 | config SND_SOC_AD73311 | ||
| 40 | tristate | ||
| 41 | |||
| 37 | config SND_SOC_AK4535 | 42 | config SND_SOC_AK4535 |
| 38 | tristate | 43 | tristate |
| 39 | 44 | ||
| @@ -58,9 +63,13 @@ config SND_SOC_CS4270_VD33_ERRATA | |||
| 58 | config SND_SOC_SSM2602 | 63 | config SND_SOC_SSM2602 |
| 59 | tristate | 64 | tristate |
| 60 | 65 | ||
| 66 | config SND_SOC_TLV320AIC23 | ||
| 67 | tristate | ||
| 68 | depends on I2C | ||
| 69 | |||
| 61 | config SND_SOC_TLV320AIC26 | 70 | config SND_SOC_TLV320AIC26 |
| 62 | tristate "TI TLV320AIC26 Codec support" | 71 | tristate "TI TLV320AIC26 Codec support" |
| 63 | depends on SND_SOC && SPI | 72 | depends on SPI |
| 64 | 73 | ||
| 65 | config SND_SOC_TLV320AIC3X | 74 | config SND_SOC_TLV320AIC3X |
| 66 | tristate | 75 | tristate |