Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6

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

diff --git a/sound/soc/sh/Kconfig b/sound/soc/sh/Kconfig
index 4c1e013381c9dbc1f7a70a38527f302334db1d34..54bd604012af6ce2d96fab4a111f7ba519292b2c 100644 (file)
--- a/sound/soc/sh/Kconfig
+++ b/sound/soc/sh/Kconfig
@@ -3,7 +3,7 @@ menu "SoC Audio support for SuperH"
 
 config SND_SOC_PCM_SH7760
        tristate "SoC Audio support for Renesas SH7760"
-       depends on CPU_SUBTYPE_SH7760 && SND_SOC && SH_DMABRG
+       depends on CPU_SUBTYPE_SH7760 && SH_DMABRG
        help
          Enable this option for SH7760 AC97/I2S audio support.
 
@@ -13,10 +13,9 @@ config SND_SOC_PCM_SH7760
 ##
 
 config SND_SOC_SH4_HAC
+       tristate
        select AC97_BUS
        select SND_SOC_AC97_BUS
-       select SND_AC97_CODEC
-       tristate
 
 config SND_SOC_SH4_SSI
        tristate