---

yaml --- r: 270491 b: refs/heads/master c: 81bca76 h: refs/heads/master i: 270489: 1be99a5 270487: 47c1353 v: v3
git-mirror · Aug 12, 2011 · f8bd98f · f8bd98f
1 parent 83b1ccc
commit f8bd98f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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);