Merge branch 'fix/hda' into topic/hda

1 files changed, 0 insertions, 17 deletions

diff --git a/sound/soc/at91/Kconfig b/sound/soc/at91/Kconfig
index 905186502e00..85a883299c2e 100644
--- a/sound/soc/at91/Kconfig
+++ b/sound/soc/at91/Kconfig
@@ -8,20 +8,3 @@ config SND_AT91_SOC
 
 config SND_AT91_SOC_SSC
         tristate
-
-config SND_AT91_SOC_ETI_B1_WM8731
-        tristate "SoC Audio support for WM8731-based Endrelia ETI-B1 boards"
-        depends on SND_AT91_SOC && (MACH_ETI_B1 || MACH_ETI_C1)
-        select SND_AT91_SOC_SSC
-        select SND_SOC_WM8731
-        help
-          Say Y if you want to add support for SoC audio on WM8731-based
-          Endrelia Technologies Inc ETI-B1 or ETI-C1 boards.
-
-config SND_AT91_SOC_ETI_SLAVE
-        bool "Run codec in slave Mode on Endrelia boards"
-        depends on SND_AT91_SOC_ETI_B1_WM8731
-        default n
-        help
-          Say Y if you want to run with the AT91 SSC generating the BCLK
-          and LRC signals on Endrelia boards.