From 3bdc87783cdb38f1e6972ccfb736c7854ce67106 Mon Sep 17 00:00:00 2001
From: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Date: Mon, 14 Jun 2010 17:09:55 -0700
Subject: [PATCH] --- yaml --- r: 203263 b: refs/heads/master c:
 f84ac08db25f60a6973cac1a90f392b286054e2f h: refs/heads/master i:   203261:
 aa291d5a61a9fca495891b232a8416346302de21   203259:
 9120a78bb5b3b2136eccc3e00960fa933df82f48   203255:
 bed07e32924bf709fa7a4e7fa469db3c6eef787b   203247:
 eef3cec10bab7ff98d3d4f7d70be21f3a6ffa3b5   203231:
 052cf303119470f0c80f65de5f2cc56386fa87e2   203199:
 b69169f8cc400d886b88046ea771e447cc38841a   203135:
 48ba54577c09fbf8acdcf07529a90b48fa400505   203007:
 e8902f6aa99801c79457852fc3bfaec87fb74df0   202751:
 09c99c4de5de2d56b5401c971b172d8f1a869e79 v: v3

---
 [refs]                                                   | 2 +-
 trunk/drivers/net/wireless/iwlwifi/Makefile              | 4 ++--
 .../wireless/iwlwifi/{iwl-calib.c => iwl-agn-calib.c}    | 9 ---------
 3 files changed, 3 insertions(+), 12 deletions(-)
 rename trunk/drivers/net/wireless/iwlwifi/{iwl-calib.c => iwl-agn-calib.c} (99%)

diff --git a/[refs] b/[refs]
index 1746268be4a2..7abd61d82cae 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f3aebeeebc9a18aa548f8c1da18f6cda28d8b732
+refs/heads/master: f84ac08db25f60a6973cac1a90f392b286054e2f
diff --git a/trunk/drivers/net/wireless/iwlwifi/Makefile b/trunk/drivers/net/wireless/iwlwifi/Makefile
index 9084c5262fa8..728bb858ba97 100644
--- a/trunk/drivers/net/wireless/iwlwifi/Makefile
+++ b/trunk/drivers/net/wireless/iwlwifi/Makefile
@@ -1,6 +1,6 @@
 obj-$(CONFIG_IWLWIFI)	+= iwlcore.o
 iwlcore-objs 		:= iwl-core.o iwl-eeprom.o iwl-hcmd.o iwl-power.o
-iwlcore-objs 		+= iwl-rx.o iwl-tx.o iwl-sta.o iwl-calib.o
+iwlcore-objs 		+= iwl-rx.o iwl-tx.o iwl-sta.o
 iwlcore-objs 		+= iwl-scan.o iwl-led.o
 iwlcore-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-debugfs.o
 iwlcore-$(CONFIG_IWLWIFI_DEVICE_TRACING) += iwl-devtrace.o
@@ -11,7 +11,7 @@ CFLAGS_iwl-devtrace.o := -I$(src)
 obj-$(CONFIG_IWLAGN)	+= iwlagn.o
 iwlagn-objs		:= iwl-agn.o iwl-agn-rs.o iwl-agn-led.o iwl-agn-ict.o
 iwlagn-objs		+= iwl-agn-ucode.o iwl-agn-hcmd.o iwl-agn-tx.o
-iwlagn-objs		+= iwl-agn-lib.o iwl-agn-rx.o
+iwlagn-objs		+= iwl-agn-lib.o iwl-agn-rx.o iwl-agn-calib.o
 iwlagn-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-agn-debugfs.o
 
 iwlagn-$(CONFIG_IWL4965) += iwl-4965.o
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-calib.c b/trunk/drivers/net/wireless/iwlwifi/iwl-agn-calib.c
similarity index 99%
rename from trunk/drivers/net/wireless/iwlwifi/iwl-calib.c
rename to trunk/drivers/net/wireless/iwlwifi/iwl-agn-calib.c
index 22fa947e8756..d03b5e57759f 100644
--- a/trunk/drivers/net/wireless/iwlwifi/iwl-calib.c
+++ b/trunk/drivers/net/wireless/iwlwifi/iwl-agn-calib.c
@@ -106,7 +106,6 @@ int iwl_send_calib_results(struct iwl_priv *priv)
 	IWL_ERR(priv, "Error %d iteration %d\n", ret, i);
 	return ret;
 }
-EXPORT_SYMBOL(iwl_send_calib_results);
 
 int iwl_calib_set(struct iwl_calib_result *res, const u8 *buf, int len)
 {
@@ -121,7 +120,6 @@ int iwl_calib_set(struct iwl_calib_result *res, const u8 *buf, int len)
 	memcpy(res->buf, buf, len);
 	return 0;
 }
-EXPORT_SYMBOL(iwl_calib_set);
 
 void iwl_calib_free_results(struct iwl_priv *priv)
 {
@@ -133,7 +131,6 @@ void iwl_calib_free_results(struct iwl_priv *priv)
 		priv->calib_results[i].buf_len = 0;
 	}
 }
-EXPORT_SYMBOL(iwl_calib_free_results);
 
 /*****************************************************************************
  * RUNTIME calibrations framework
@@ -533,7 +530,6 @@ void iwl_init_sensitivity(struct iwl_priv *priv)
 	ret |= iwl_sensitivity_write(priv);
 	IWL_DEBUG_CALIB(priv, "<<return 0x%X\n", ret);
 }
-EXPORT_SYMBOL(iwl_init_sensitivity);
 
 void iwl_sensitivity_calibration(struct iwl_priv *priv,
 				    struct iwl_notif_statistics *resp)
@@ -639,7 +635,6 @@ void iwl_sensitivity_calibration(struct iwl_priv *priv,
 	iwl_sens_energy_cck(priv, norm_fa_cck, rx_enable_time, &statis);
 	iwl_sensitivity_write(priv);
 }
-EXPORT_SYMBOL(iwl_sensitivity_calibration);
 
 static inline u8 find_first_chain(u8 mask)
 {
@@ -897,8 +892,6 @@ void iwl_chain_noise_calibration(struct iwl_priv *priv,
 	data->state = IWL_CHAIN_NOISE_DONE;
 	iwl_power_update_mode(priv, false);
 }
-EXPORT_SYMBOL(iwl_chain_noise_calibration);
-
 
 void iwl_reset_run_time_calib(struct iwl_priv *priv)
 {
@@ -915,5 +908,3 @@ void iwl_reset_run_time_calib(struct iwl_priv *priv)
 	 * periodically after association */
 	iwl_send_statistics_request(priv, CMD_ASYNC, true);
 }
-EXPORT_SYMBOL(iwl_reset_run_time_calib);
-