From: Ron Rindjunsky <ron.rindjunsky@intel.com>
Date: Mon, 5 May 2008 02:22:29 +0000 (+0800)
Subject: iwlwifi-5000: rename iwl5000_init_nic to iwl5000_init_config
X-Git-Tag: v2.6.27-rc1~969^2~441^2~35
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5a835353fb3c68a3da3badcc485614cdfc6e6109;p=linux-2.6-omap-h63xx.git

iwlwifi-5000: rename iwl5000_init_nic to iwl5000_init_config

Signed-off-by: Ron Rindjunsky <ron.rindjunsky@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c
index 0d8ef63f871..83ed69dfac6 100644
--- a/drivers/net/wireless/iwlwifi/iwl-5000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-5000.c
@@ -86,7 +86,7 @@ static int iwl5000_apm_init(struct iwl_priv *priv)
 	return ret;
 }
 
-static void iwl5000_nic_init(struct iwl_priv *priv)
+static void iwl5000_nic_config(struct iwl_priv *priv)
 {
 	unsigned long flags;
 	u16 radio_cfg;
@@ -439,7 +439,7 @@ static struct iwl_lib_ops iwl5000_lib = {
 	.txq_update_byte_cnt_tbl = iwl5000_txq_update_byte_cnt_tbl,
 	.apm_ops = {
 		.init =	iwl5000_apm_init,
-		.config = iwl5000_nic_init,
+		.config = iwl5000_nic_config,
 		.set_pwr_src = iwl4965_set_pwr_src,
 	},
 	.eeprom_ops = {