diff options
| author | Stephen Warren <swarren@nvidia.com> | 2014-03-10 12:38:40 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-13 05:45:09 -0400 |
| commit | f410d5c953cf3c11629f138c5a2c3d3f40c61b5d (patch) | |
| tree | 7dec64c72408807962249d2faf1a65a45cf0ddc0 | |
| parent | a8282136a1b811edb95b3c0e1d9664510afaa307 (diff) | |
ASoC: Intel: don't select RT5640 if !I2C
The rt5640 driver won't compile without I2C enabled. Hence, the Intel
Haswell and Baytrail+RT5640 ASoC drivers must also depend on I2C, since
these select RT5640.
This solves:
sound/soc/codecs/rt5640.c:2220:1: warning: data definition has no type or storage class [enabled by default]
sound/soc/codecs/rt5640.c:2220:1: error: type defaults to ‘int’ in declaration of ‘module_i2c_driver’ [-Werror=implicit-int]
sound/soc/codecs/rt5640.c:2220:1: warning: parameter names (without types) in function declaration [enabled by default]
sound/soc/codecs/rt5640.c:2210:26: warning: ‘rt5640_i2c_driver’ defined but not used [-Wunused-variable]
Reported-by: Jim Davis <jim.epost@gmail.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
| -rw-r--r-- | sound/soc/intel/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/intel/Kconfig b/sound/soc/intel/Kconfig index 4577b69fcf2c..3c81b3891209 100644 --- a/sound/soc/intel/Kconfig +++ b/sound/soc/intel/Kconfig | |||
| @@ -32,7 +32,7 @@ config SND_SOC_INTEL_BAYTRAIL | |||
| 32 | 32 | ||
| 33 | config SND_SOC_INTEL_HASWELL_MACH | 33 | config SND_SOC_INTEL_HASWELL_MACH |
| 34 | tristate "ASoC Audio DSP support for Intel Haswell Lynxpoint" | 34 | tristate "ASoC Audio DSP support for Intel Haswell Lynxpoint" |
| 35 | depends on SND_SOC_INTEL_SST && X86_INTEL_LPSS | 35 | depends on SND_SOC_INTEL_SST && X86_INTEL_LPSS && I2C |
| 36 | select SND_SOC_INTEL_HASWELL | 36 | select SND_SOC_INTEL_HASWELL |
| 37 | select SND_SOC_RT5640 | 37 | select SND_SOC_RT5640 |
| 38 | help | 38 | help |
| @@ -43,7 +43,7 @@ config SND_SOC_INTEL_HASWELL_MACH | |||
| 43 | 43 | ||
| 44 | config SND_SOC_INTEL_BYT_RT5640_MACH | 44 | config SND_SOC_INTEL_BYT_RT5640_MACH |
| 45 | tristate "ASoC Audio driver for Intel Baytrail with RT5640 codec" | 45 | tristate "ASoC Audio driver for Intel Baytrail with RT5640 codec" |
| 46 | depends on SND_SOC_INTEL_SST && X86_INTEL_LPSS | 46 | depends on SND_SOC_INTEL_SST && X86_INTEL_LPSS && I2C |
| 47 | select SND_SOC_INTEL_BAYTRAIL | 47 | select SND_SOC_INTEL_BAYTRAIL |
| 48 | select SND_SOC_RT5640 | 48 | select SND_SOC_RT5640 |
| 49 | help | 49 | help |