diff --git a/[refs] b/[refs]
index 459f2066dcf1..e27f1cf3f06e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 003353b0d27489228eff79447d0731687cea0207
+refs/heads/master: a846401f9f99f2b823a5d685b2977cc2f41134be
diff --git a/trunk/drivers/net/wireless/ath/ath6kl/testmode.h b/trunk/drivers/net/wireless/ath/ath6kl/testmode.h
index 2e6b723d1da2..43dffcc11fb1 100644
--- a/trunk/drivers/net/wireless/ath/ath6kl/testmode.h
+++ b/trunk/drivers/net/wireless/ath/ath6kl/testmode.h
@@ -16,5 +16,21 @@
 
 #include "core.h"
 
+#ifdef CONFIG_NL80211_TESTMODE
+
 void ath6kl_tm_rx_report_event(struct ath6kl *ar, void *buf, size_t buf_len);
 int ath6kl_tm_cmd(struct wiphy *wiphy, void *data, int len);
+
+#else
+
+static inline void ath6kl_tm_rx_report_event(struct ath6kl *ar, void *buf,
+					     size_t buf_len)
+{
+}
+
+static inline int ath6kl_tm_cmd(struct wiphy *wiphy, void *data, int len)
+{
+	return 0;
+}
+
+#endif