Merge remote-tracking branches 'asoc/topic/tlv320aic3x', 'asoc/topic/width', 'asoc...

[mirror_ubuntu-bionic-kernel.git] / sound / soc / kirkwood / Kconfig

diff --git a/sound/soc/kirkwood/Kconfig b/sound/soc/kirkwood/Kconfig
index 06f4e8aa93ae71675190901eb0005fc5cd86fd87..132bb83f8e99aff300e13dc636dc41966d2b2dfb 100644 (file)
--- a/sound/soc/kirkwood/Kconfig
+++ b/sound/soc/kirkwood/Kconfig
@@ -1,6 +1,6 @@
 config SND_KIRKWOOD_SOC
        tristate "SoC Audio for the Marvell Kirkwood and Dove chips"
-       depends on ARCH_KIRKWOOD || ARCH_DOVE || ARCH_MVEBU || MACH_KIRKWOOD || COMPILE_TEST
+       depends on ARCH_DOVE || ARCH_MVEBU || COMPILE_TEST
        help
          Say Y or M if you want to add support for codecs attached to
          the Kirkwood I2S interface. You will also need to select the
@@ -15,20 +15,3 @@ config SND_KIRKWOOD_SOC_ARMADA370_DB
          Say Y if you want to add support for SoC audio on
          the Armada 370 Development Board.
 
-config SND_KIRKWOOD_SOC_OPENRD
-       tristate "SoC Audio support for Kirkwood Openrd Client"
-       depends on SND_KIRKWOOD_SOC && (MACH_OPENRD_CLIENT || MACH_OPENRD_ULTIMATE || COMPILE_TEST)
-       depends on I2C
-       select SND_SOC_CS42L51
-       help
-         Say Y if you want to add support for SoC audio on
-         Openrd Client.
-
-config SND_KIRKWOOD_SOC_T5325
-       tristate "SoC Audio support for HP t5325"
-       depends on SND_KIRKWOOD_SOC && (MACH_T5325 || COMPILE_TEST) && I2C
-       select SND_SOC_ALC5623
-       help
-         Say Y if you want to add support for SoC audio on
-         the HP t5325 thin client.
-