summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDon Fry <donald.h.fry@intel.com>2011-11-28 14:34:13 -0800
committerWey-Yi Guy <wey-yi.w.guy@intel.com>2011-12-02 08:22:45 -0800
commit8a3cb29c83697cab0f237217112df78439a1b2dd (patch)
tree5dcdb5791820873aa1da243e108282fd2682ac07
parent7152375d4daed8000e331492678be84b32c46027 (diff)
downloadlinux-3.10-8a3cb29c83697cab0f237217112df78439a1b2dd.tar.gz
linux-3.10-8a3cb29c83697cab0f237217112df78439a1b2dd.tar.bz2
linux-3.10-8a3cb29c83697cab0f237217112df78439a1b2dd.zip
iwlwifi: rename iwl-agn-ucode as iwl-ucode
iwl-agn-ucode is generic ucode operations, not limited just to iwlagn. Signed-off-by: Don Fry <donald.h.fry@intel.com> Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
-rw-r--r--drivers/net/wireless/iwlwifi/Makefile2
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-ucode.c (renamed from drivers/net/wireless/iwlwifi/iwl-agn-ucode.c)0
2 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/Makefile b/drivers/net/wireless/iwlwifi/Makefile
index 5a052a5e4fb..86344cefd32 100644
--- a/drivers/net/wireless/iwlwifi/Makefile
+++ b/drivers/net/wireless/iwlwifi/Makefile
@@ -1,7 +1,7 @@
# WIFI
obj-$(CONFIG_IWLWIFI) += iwlwifi.o
iwlwifi-objs := iwl-agn.o iwl-agn-rs.o iwl-mac80211.o
-iwlwifi-objs += iwl-agn-ucode.o iwl-agn-tx.o
+iwlwifi-objs += iwl-ucode.o iwl-agn-tx.o
iwlwifi-objs += iwl-agn-lib.o iwl-agn-calib.o iwl-io.o
iwlwifi-objs += iwl-agn-tt.o iwl-agn-sta.o iwl-agn-rx.o
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c b/drivers/net/wireless/iwlwifi/iwl-ucode.c
index 76949106daf..76949106daf 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-ucode.c
+++ b/drivers/net/wireless/iwlwifi/iwl-ucode.c