---

yaml --- r: 291322 b: refs/heads/master c: e6dd583 h: refs/heads/master v: v3
git-mirror · Mar 8, 2012 · 3327a6f · 3327a6f
1 parent c447f4b
commit 3327a6f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bada991b4590122c847520ed2b651b679c16afd3
+refs/heads/master: e6dd5838acf312516fcc4eb34516de5bc45e2980
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c b/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -488,7 +488,7 @@ static void iwl_bg_tx_flush(struct work_struct *work)
 	iwlagn_dev_txfifo_flush(priv, IWL_DROP_ALL);
 }
 
-void iwl_init_context(struct iwl_priv *priv, u32 ucode_flags)
+static void iwl_init_context(struct iwl_priv *priv, u32 ucode_flags)
 {
 	int i;
 

diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-agn.h b/trunk/drivers/net/wireless/iwlwifi/iwl-agn.h
@@ -118,7 +118,6 @@ void iwlagn_config_ht40(struct ieee80211_conf *conf,
 int iwlagn_rx_calib_result(struct iwl_priv *priv,
 			    struct iwl_rx_cmd_buffer *rxb,
 			    struct iwl_device_cmd *cmd);
-void iwl_init_context(struct iwl_priv *priv, u32 ucode_flags);
 int iwl_send_bt_env(struct iwl_priv *priv, u8 action, u8 type);
 void iwl_send_prio_tbl(struct iwl_priv *priv);
 int iwl_init_alive_start(struct iwl_priv *priv);
-Original file line number
+Diff line change
@@ Expand Up / @@ -488,7 +488,7 @@ static void iwl_bg_tx_flush(struct work_struct *work) @@
     	iwlagn_dev_txfifo_flush(priv, IWL_DROP_ALL);
     }
-    void iwl_init_context(struct iwl_priv *priv, u32 ucode_flags)
+    static void iwl_init_context(struct iwl_priv *priv, u32 ucode_flags)
     {
     	int i;
@@ Expand Down @@