diff --git a/[refs] b/[refs]
index a152a2e7d664..66ccb8cbdc82 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab1f5c0bb8edbaee81c1672733f8dc4d0a5f5ea5
+refs/heads/master: f2f1ba253d970479343f97c4620e16842c695d03
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-rx.c b/trunk/drivers/net/wireless/iwlwifi/iwl-rx.c
index 096523200327..71a2a515ce15 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-rx.c
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-rx.c
@@ -751,12 +751,6 @@ static void iwl_dbg_report_frame(struct iwl_priv *priv,
 	if (print_dump)
 		iwl_print_hex_dump(priv, IWL_DL_RX, header, length);
 }
-#else
-static void iwl_dbg_report_frame(struct iwl_priv *priv,
-		      struct iwl_rx_phy_res *phy_res, u16 length,
-		      struct ieee80211_hdr *header, int group100)
-{
-}
 #endif
 
 static void iwl_update_rx_stats(struct iwl_priv *priv, u16 fc, u16 len)