diff --git a/[refs] b/[refs]
index 42fb919474b2..ff0389d8e928 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 381bd10aff491216383291879b29461efb575119
+refs/heads/master: 65836112fc24bdf009554481b36b6ba0a690b855
diff --git a/trunk/include/linux/wl12xx.h b/trunk/include/linux/wl12xx.h
index 95deae3968f4..4f902e1908aa 100644
--- a/trunk/include/linux/wl12xx.h
+++ b/trunk/include/linux/wl12xx.h
@@ -32,7 +32,20 @@ struct wl12xx_platform_data {
 	int board_ref_clock;
 };
 
+#ifdef CONFIG_WL12XX_PLATFORM_DATA
+
 int wl12xx_set_platform_data(const struct wl12xx_platform_data *data);
+
+#else
+
+static inline
+int wl12xx_set_platform_data(const struct wl12xx_platform_data *data)
+{
+	return -ENOSYS;
+}
+
+#endif
+
 const struct wl12xx_platform_data *wl12xx_get_platform_data(void);
 
 #endif