diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2013-03-03 00:51:24 +0100 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2013-03-03 00:51:24 +0100 |
| commit | d6fa4ec20db6bd0b403d2d99fd9423e6c0f3f845 (patch) | |
| tree | e9ddb16309d2b546a400593afc07846ce9ed6746 /sound | |
| parent | dc1cfc34b2a07c5441d68ca21ae4296822ee4df6 (diff) | |
| parent | 1ff6b9489fbc737e3e2bc7660b92cebbfaea5247 (diff) | |
Conflicts:
arch/arm/mach-tegra/common.c
drivers/ata/ahci-tegra.c
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/tegra/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/soc/tegra/Kconfig b/sound/soc/tegra/Kconfig index 1bfe202d0574..a47a746a2b7e 100644 --- a/sound/soc/tegra/Kconfig +++ b/sound/soc/tegra/Kconfig @@ -234,6 +234,7 @@ config SND_SOC_TEGRA_RT5640 select SND_SOC_TEGRA30_I2S if ARCH_TEGRA_3x_SOC select SND_SOC_TEGRA30_SPDIF if ARCH_TEGRA_3x_SOC select SND_SOC_RT5640 + select SND_SOC_RT5639 select SND_SOC_SPDIF select SND_SOC_TEGRA30_DAM if ARCH_TEGRA_3x_SOC help |