From f8bd98feb72d7481a600b9c5463042a0e43aa25c Mon Sep 17 00:00:00 2001
From: Stephen Warren <swarren@nvidia.com>
Date: Thu, 11 Aug 2011 11:59:11 -0600
Subject: [PATCH] --- yaml --- r: 270491 b: refs/heads/master c:
 81bca7624db4720db686fa38435c39ea95b7be8f h: refs/heads/master i:   270489:
 1be99a5e5299197628dcfbb63a9f49a29eaf0af3   270487:
 47c1353b6d585f49b9ff1cc6f4dc10254fb2163e v: v3

---
 [refs]                   | 2 +-
 trunk/sound/soc/soc-io.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 02a6c908201d..4a244b6fba6b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 68d5a59e0ceb69fe8e4123666d9398c3c1331d8a
+refs/heads/master: 81bca7624db4720db686fa38435c39ea95b7be8f
diff --git a/trunk/sound/soc/soc-io.c b/trunk/sound/soc/soc-io.c
index be5aac3d7a1b..22b64317182b 100644
--- a/trunk/sound/soc/soc-io.c
+++ b/trunk/sound/soc/soc-io.c
@@ -122,14 +122,14 @@ int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec,
 	config.val_bits = data_bits;
 
 	switch (control) {
-#ifdef CONFIG_REGMAP_I2C
+#if defined(CONFIG_REGMAP_I2C) || defined(CONFIG_REGMAP_I2C_MODULE)
 	case SND_SOC_I2C:
 		codec->control_data = regmap_init_i2c(to_i2c_client(codec->dev),
 						      &config);
 		break;
 #endif
 
-#ifdef CONFIG_REGMAP_SPI
+#if defined(CONFIG_REGMAP_SPI) || defined(CONFIG_REGMAP_SPI_MODULE)
 	case SND_SOC_SPI:
 		codec->control_data = regmap_init_spi(to_spi_device(codec->dev),
 						      &config);