diff --git a/[refs] b/[refs]
index badd70b4ca8d..5538c37a06f6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 80693ceb78b08baa3b66a900d9225b2cf9c6f0ed
+refs/heads/master: 25bc2deda9e8a430ed49f507a1120fb2c86abf33
diff --git a/trunk/drivers/net/wireless/iwlwifi/Makefile b/trunk/drivers/net/wireless/iwlwifi/Makefile
index f50d2f8fd5c9..6bf3998736b5 100644
--- a/trunk/drivers/net/wireless/iwlwifi/Makefile
+++ b/trunk/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/trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c b/trunk/drivers/net/wireless/iwlwifi/iwl-agn.c
similarity index 100%
rename from trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c
rename to trunk/drivers/net/wireless/iwlwifi/iwl-agn.c