From e820acb9d87f74290d34fabd345cc35852a13bed Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Mon, 10 Aug 2009 16:04:39 -0700 Subject: [PATCH] --- yaml --- r: 157633 b: refs/heads/master c: 17244c24f95ba61a12b6afeab5780a1e3f1a4c57 h: refs/heads/master i: 157631: bebc4561fdadd12e9a44fe752b8abaa97842cf04 v: v3 --- [refs] | 2 +- trunk/sound/soc/soc-cache.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 917eeddf8f39..46dace2e07ca 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e0c48a18f76415d3ec1ac28e5f7a0df10e2f3d8c +refs/heads/master: 17244c24f95ba61a12b6afeab5780a1e3f1a4c57 diff --git a/trunk/sound/soc/soc-cache.c b/trunk/sound/soc/soc-cache.c index 56ec3f22bf1c..c8ceddc2a26c 100644 --- a/trunk/sound/soc/soc-cache.c +++ b/trunk/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)