---

yaml --- r: 270505 b: refs/heads/master c: 4835ff9 h: refs/heads/master i: 270503: 7a1610a v: v3
git-mirror · Aug 14, 2011 · 8c2c98b · 8c2c98b
1 parent 10a98a7
commit 8c2c98b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: afe8db5f756ceb017dbcf2800f9a7302ee49a385
+refs/heads/master: 4835ff9aca639107ca0233c10aa854d460c8797d
diff --git a/trunk/sound/soc/soc-io.c b/trunk/sound/soc/soc-io.c
@@ -18,6 +18,7 @@
 
 #include <trace/events/asoc.h>
 
+#ifdef CONFIG_REGMAP
 static int hw_write(struct snd_soc_codec *codec, unsigned int reg,
 		    unsigned int value)
 {
@@ -150,4 +151,12 @@ int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec,
 	return 0;
 }
 EXPORT_SYMBOL_GPL(snd_soc_codec_set_cache_io);
-
+#else
+int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec,
+			       int addr_bits, int data_bits,
+			       enum snd_soc_control_type control)
+{
+	return -ENOTSUPP;
+}
+EXPORT_SYMBOL_GPL(snd_soc_codec_set_cache_io);
+#endif