diff options
| author | Randy Dunlap | 2009-08-11 01:04:39 +0200 |
|---|---|---|
| committer | Mark Brown | 2009-08-11 11:47:25 +0200 |
| commit | 17244c24f95ba61a12b6afeab5780a1e3f1a4c57 (patch) | |
| tree | 333e814a7d3ccc982853ffd76f3b6bfcae08b861 | |
| parent | ASoC: Drop unneeded declaration of removed wm8731 SPI write function (diff) | |
| download | kernel-qcow2-linux-17244c24f95ba61a12b6afeab5780a1e3f1a4c57.tar.gz kernel-qcow2-linux-17244c24f95ba61a12b6afeab5780a1e3f1a4c57.tar.xz kernel-qcow2-linux-17244c24f95ba61a12b6afeab5780a1e3f1a4c57.zip | |
ASoC: fix I2C build errors
Fix soc build errors when I2C is built as a loadable module:
(.text+0x5d26b): undefined reference to `i2c_master_send'
soc-cache.c:(.text+0x5d32d): undefined reference to `i2c_transfer'
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| -rw-r--r-- | sound/soc/soc-cache.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/soc-cache.c b/sound/soc/soc-cache.c index 56ec3f22bf1c..c8ceddc2a26c 100644 --- a/sound/soc/soc-cache.c +++ b/sound/soc/soc-cache.c @@ -108,7 +108,7 @@ static unsigned int snd_soc_8_16_read(struct snd_soc_codec *codec, return cache[reg]; } -#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) +#if defined(CONFIG_I2C) || (defined(CONFIG_I2C_MODULE) && defined(MODULE)) static unsigned int snd_soc_8_16_read_i2c(struct snd_soc_codec *codec, unsigned int r) { @@ -200,7 +200,7 @@ int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec, break; case SND_SOC_I2C: -#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) +#if defined(CONFIG_I2C) || (defined(CONFIG_I2C_MODULE) && defined(MODULE)) codec->hw_write = (hw_write_t)i2c_master_send; #endif if (io_types[i].i2c_read) |