summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomas Winkler2008-07-21 01:40:13 +0200
committerJohn W. Linville2008-08-04 21:09:10 +0200
commit25bc2deda9e8a430ed49f507a1120fb2c86abf33 (patch)
tree77d9730c5a7958886013e887f9e82e3ded6f18d5
parentmac80211: automatic IBSS channel selection (diff)
downloadkernel-qcow2-linux-25bc2deda9e8a430ed49f507a1120fb2c86abf33.tar.gz
kernel-qcow2-linux-25bc2deda9e8a430ed49f507a1120fb2c86abf33.tar.xz
kernel-qcow2-linux-25bc2deda9e8a430ed49f507a1120fb2c86abf33.zip
iwlwifi: rename iwl4965-base.c to iwl-agn.c
This patch renames iwl4965-base.c to iwl-agn.c Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/iwlwifi/Makefile6
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn.c (renamed from drivers/net/wireless/iwlwifi/iwl4965-base.c)0
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlwifi/Makefile b/drivers/net/wireless/iwlwifi/Makefile
index f50d2f8fd5c9..6bf3998736b5 100644
--- a/drivers/net/wireless/iwlwifi/Makefile
+++ b/drivers/net/wireless/iwlwifi/Makefile
@@ -11,10 +11,8 @@ iwl3945-objs := iwl3945-base.o iwl-3945.o iwl-3945-rs.o
iwl3945-$(CONFIG_IWL3945_LEDS) += iwl-3945-led.o
obj-$(CONFIG_IWL4965) += iwl4965.o
-iwl4965-objs := iwl4965-base.o iwl-4965.o iwl-agn-rs.o
+iwl4965-objs := iwl-agn.o iwl-4965.o iwl-agn-rs.o
-ifeq ($(CONFIG_IWL5000),y)
- iwl4965-objs += iwl-5000.o
-endif
+iwl4965-$(CONFIG_IWL5000) += iwl-5000.o
diff --git a/drivers/net/wireless/iwlwifi/iwl4965-base.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index f71b3f3f81ba..f71b3f3f81ba 100644
--- a/drivers/net/wireless/iwlwifi/iwl4965-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c