From 898a757819c648c30a50a9f135f42f6c6837c01c Mon Sep 17 00:00:00 2001
From: Seungwhan Youn <sw.youn@samsung.com>
Date: Mon, 4 Apr 2011 13:43:42 +0900
Subject: [PATCH] --- yaml --- r: 248249 b: refs/heads/master c:
 898f8b0b65715843f7afd86f3867270dc9ed8b74 h: refs/heads/master i:   248247:
 e93e521aa370c44b8c355aa6814a4717ed009075 v: v3

---
 [refs]                      | 2 +-
 trunk/sound/soc/soc-cache.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 09b25b1089d6..8b524980444b 100644
--- 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
index 22b099076223..8418b1fa1976 100644
--- 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();
 	}