diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-02-09 10:54:50 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-02-09 10:54:50 +0300 |
| commit | d1612c80edaab7ac9170cb2fc86b538ab2e5a741 (patch) | |
| tree | 759755d5abef02f23a42f5056aaac84de694d5ad /sound/soc/samsung/Kconfig | |
| parent | d34890cf4113397625a6629d71749fa638a7a734 (diff) | |
| parent | f4c2e9bcb0be4ee1c8722853e4faaaf6a9423d72 (diff) | |
| download | linux-d1612c80edaab7ac9170cb2fc86b538ab2e5a741.tar.xz | |
Merge tag 'asoc-v3.20-3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Final updates for v3.20
A few more updates for v3.20 that have accumilated over the second half
of last week. One new (relatively simple) driver for the Maxim
max98357a and some other driver specific fixes and enhancements. I did
apply a few patches that haven't been in -next just now before sending
this, all fixes except for one simple device ID addition patch.
Diffstat (limited to 'sound/soc/samsung/Kconfig')
| -rw-r--r-- | sound/soc/samsung/Kconfig | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig index e817a2f43ea8..3cebf6ca03df 100644 --- a/sound/soc/samsung/Kconfig +++ b/sound/soc/samsung/Kconfig @@ -146,17 +146,6 @@ config SND_SOC_SMARTQ select SND_SAMSUNG_I2S select SND_SOC_WM8750 -config SND_SOC_GONI_AQUILA_WM8994 - tristate "SoC I2S Audio support for AQUILA/GONI - WM8994" - depends on SND_SOC_SAMSUNG && (MACH_GONI || MACH_AQUILA) - depends on I2C=y - select SND_SAMSUNG_I2S - select MFD_WM8994 - select SND_SOC_WM8994 - help - Say Y if you want to add support for SoC audio on goni or aquila - with the WM8994. - config SND_SOC_SAMSUNG_SMDK_SPDIF tristate "SoC S/PDIF Audio support for SMDK" depends on SND_SOC_SAMSUNG |