diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2014-03-31 12:33:09 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-03-31 12:33:09 +0200 |
| commit | 69dd89fd2b9406603d218cab8996cfb232d5b8b9 (patch) | |
| tree | 467a65877d0c550ae7c937bc658abd313958122f /sound/soc/fsl/Kconfig | |
| parent | ALSA: ice1712: Add suspend support for M-Audio ICE1712-based cards (diff) | |
| parent | Merge remote-tracking branches 'asoc/topic/tdm' and 'asoc/topic/tegra' into asoc-next (diff) | |
| download | linux-dev-69dd89fd2b9406603d218cab8996cfb232d5b8b9.tar.xz linux-dev-69dd89fd2b9406603d218cab8996cfb232d5b8b9.zip | |
Merge tag 'asoc-v3.15-4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Final updates for v3.15 merge window
A few more updates from last week - use of the tdm_slot mapping from
Xiubo plus a few smaller fixes and cleanups.
Diffstat (limited to 'sound/soc/fsl/Kconfig')
| -rw-r--r-- | sound/soc/fsl/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/fsl/Kconfig b/sound/soc/fsl/Kconfig index 597962ec28fa..338a91642471 100644 --- a/sound/soc/fsl/Kconfig +++ b/sound/soc/fsl/Kconfig @@ -13,6 +13,7 @@ config SND_SOC_FSL_SPDIF config SND_SOC_FSL_ESAI tristate select REGMAP_MMIO + select SND_SOC_FSL_UTILS config SND_SOC_FSL_UTILS tristate @@ -120,6 +121,7 @@ if SND_IMX_SOC config SND_SOC_IMX_SSI tristate + select SND_SOC_FSL_UTILS config SND_SOC_IMX_PCM_FIQ tristate |