diff options
| author | Mark Brown <broonie@kernel.org> | 2015-03-04 15:42:43 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-03-04 15:42:43 -0500 |
| commit | 95d67c7fc2e5fa21befb1a07bc016748d9cd6192 (patch) | |
| tree | 920115542e84423a94b9f605491df2c0c3748123 /sound | |
| parent | c6eb1fa4a7c4dd994fcbe59f3c2b921342fa5f5c (diff) | |
| parent | 014c4d637604c9af2f7f2ff4fd91b725a0c58a5c (diff) | |
Merge remote-tracking branch 'asoc/fix/samsung' into asoc-linus
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/samsung/Kconfig | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/samsung/Kconfig b/sound/soc/samsung/Kconfig index 3cebf6ca03df..0632a36852c8 100644 --- a/sound/soc/samsung/Kconfig +++ b/sound/soc/samsung/Kconfig | |||
| @@ -174,7 +174,7 @@ config SND_SOC_SMDK_WM8994_PCM | |||
| 174 | 174 | ||
| 175 | config SND_SOC_SPEYSIDE | 175 | config SND_SOC_SPEYSIDE |
| 176 | tristate "Audio support for Wolfson Speyside" | 176 | tristate "Audio support for Wolfson Speyside" |
| 177 | depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410 | 177 | depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410 && I2C && SPI_MASTER |
| 178 | select SND_SAMSUNG_I2S | 178 | select SND_SAMSUNG_I2S |
| 179 | select SND_SOC_WM8996 | 179 | select SND_SOC_WM8996 |
| 180 | select SND_SOC_WM9081 | 180 | select SND_SOC_WM9081 |
| @@ -189,7 +189,7 @@ config SND_SOC_TOBERMORY | |||
| 189 | 189 | ||
| 190 | config SND_SOC_BELLS | 190 | config SND_SOC_BELLS |
| 191 | tristate "Audio support for Wolfson Bells" | 191 | tristate "Audio support for Wolfson Bells" |
| 192 | depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410 && MFD_ARIZONA | 192 | depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410 && MFD_ARIZONA && I2C && SPI_MASTER |
| 193 | select SND_SAMSUNG_I2S | 193 | select SND_SAMSUNG_I2S |
| 194 | select SND_SOC_WM5102 | 194 | select SND_SOC_WM5102 |
| 195 | select SND_SOC_WM5110 | 195 | select SND_SOC_WM5110 |
| @@ -206,7 +206,7 @@ config SND_SOC_LOWLAND | |||
| 206 | 206 | ||
| 207 | config SND_SOC_LITTLEMILL | 207 | config SND_SOC_LITTLEMILL |
| 208 | tristate "Audio support for Wolfson Littlemill" | 208 | tristate "Audio support for Wolfson Littlemill" |
| 209 | depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410 | 209 | depends on SND_SOC_SAMSUNG && MACH_WLF_CRAGG_6410 && I2C |
| 210 | select SND_SAMSUNG_I2S | 210 | select SND_SAMSUNG_I2S |
| 211 | select MFD_WM8994 | 211 | select MFD_WM8994 |
| 212 | select SND_SOC_WM8994 | 212 | select SND_SOC_WM8994 |
| @@ -223,7 +223,7 @@ config SND_SOC_SNOW | |||
| 223 | 223 | ||
| 224 | config SND_SOC_ODROIDX2 | 224 | config SND_SOC_ODROIDX2 |
| 225 | tristate "Audio support for Odroid-X2 and Odroid-U3" | 225 | tristate "Audio support for Odroid-X2 and Odroid-U3" |
| 226 | depends on SND_SOC_SAMSUNG | 226 | depends on SND_SOC_SAMSUNG && I2C |
| 227 | select SND_SOC_MAX98090 | 227 | select SND_SOC_MAX98090 |
| 228 | select SND_SAMSUNG_I2S | 228 | select SND_SAMSUNG_I2S |
| 229 | help | 229 | help |
| @@ -231,6 +231,6 @@ config SND_SOC_ODROIDX2 | |||
| 231 | 231 | ||
| 232 | config SND_SOC_ARNDALE_RT5631_ALC5631 | 232 | config SND_SOC_ARNDALE_RT5631_ALC5631 |
| 233 | tristate "Audio support for RT5631(ALC5631) on Arndale Board" | 233 | tristate "Audio support for RT5631(ALC5631) on Arndale Board" |
| 234 | depends on SND_SOC_SAMSUNG | 234 | depends on SND_SOC_SAMSUNG && I2C |
| 235 | select SND_SAMSUNG_I2S | 235 | select SND_SAMSUNG_I2S |
| 236 | select SND_SOC_RT5631 | 236 | select SND_SOC_RT5631 |