---

yaml --- r: 248249 b: refs/heads/master c: 898f8b0 h: refs/heads/master i: 248247: e93e521 v: v3
git-mirror · Apr 4, 2011 · 898a757 · 898a757
1 parent 37e5435
commit 898a757
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f6fcdc145679f5c86ff3fe587b060c9c3709d360
+refs/heads/master: 898f8b0b65715843f7afd86f3867270dc9ed8b74
diff --git a/trunk/sound/soc/soc-cache.c b/trunk/sound/soc/soc-cache.c
@@ -414,12 +414,16 @@ static int snd_soc_hw_bulk_write_raw(struct snd_soc_codec *codec, unsigned int r
 		return -EINVAL;
 
 	switch (codec->control_type) {
+#if defined(CONFIG_I2C) || (defined(CONFIG_I2C_MODULE) && defined(MODULE))
 	case SND_SOC_I2C:
 		ret = i2c_master_send(codec->control_data, data, len);
 		break;
+#endif
+#if defined(CONFIG_SPI_MASTER)
 	case SND_SOC_SPI:
 		ret = do_spi_write(codec->control_data, data, len);
 		break;
+#endif
 	default:
 		BUG();
 	}