diff --git a/[refs] b/[refs]
index edec78e22aed..d0f99c7df402 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 84bc278b1f04920e867e4b46e094bcc066393d41
+refs/heads/master: b78ddb10704a7f930e5e631de8227c78a6676a1b
diff --git a/trunk/include/sound/soc-of-simple.h b/trunk/include/sound/soc-of-simple.h
index 696fc513e234..a064e1934a56 100644
--- a/trunk/include/sound/soc-of-simple.h
+++ b/trunk/include/sound/soc-of-simple.h
@@ -7,6 +7,8 @@
 #ifndef _INCLUDE_SOC_OF_H_
 #define _INCLUDE_SOC_OF_H_
 
+#if defined(CONFIG_SND_SOC_OF_SIMPLE) || defined(CONFIG_SND_SOC_OF_SIMPLE_MODULE)
+
 #include <linux/of.h>
 #include <sound/soc.h>
 
@@ -18,4 +20,6 @@ int of_snd_soc_register_platform(struct snd_soc_platform *platform,
 				 struct device_node *node,
 				 struct snd_soc_dai *cpu_dai);
 
+#endif
+
 #endif /* _INCLUDE_SOC_OF_H_ */