Merge branch 'sched/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...

[pandora-kernel.git] / sound / soc / at91 / Kconfig

diff --git a/sound/soc/at91/Kconfig b/sound/soc/at91/Kconfig
index 5bcf08b..9051865 100644 (file)
--- a/sound/soc/at91/Kconfig
+++ b/sound/soc/at91/Kconfig
@@ -1,21 +1,18 @@
-menu "SoC Audio for the Atmel AT91"
-
 config SND_AT91_SOC
        tristate "SoC Audio for the Atmel AT91 System-on-Chip"
-       depends on ARCH_AT91 && SND
-       select SND_PCM
+       depends on ARCH_AT91
        help
          Say Y or M if you want to add support for codecs attached to
          the AT91 SSC interface. You will also need
          to select the audio interfaces to support below.
 
-config SND_AT91_SOC_I2S
+config SND_AT91_SOC_SSC
        tristate
 
 config SND_AT91_SOC_ETI_B1_WM8731
-       tristate "SoC I2S Audio support for WM8731-based Endrelia ETI-B1 boards"
+       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_I2S
+       select SND_AT91_SOC_SSC
        select SND_SOC_WM8731
        help
          Say Y if you want to add support for SoC audio on WM8731-based
@@ -28,5 +25,3 @@ config SND_AT91_SOC_ETI_SLAVE
        help
          Say Y if you want to run with the AT91 SSC generating the BCLK
          and LRC signals on Endrelia boards.
-
-endmenu