diff --git a/[refs] b/[refs]
index 74afc9cb5a47..7805989d0f14 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fcb74588dccb06d8e3e13afb36c5401cae470518
+refs/heads/master: f3a1b49d669472159e05327fff64ec55315a0f54
diff --git a/trunk/drivers/net/wireless/iwlegacy/iwl-4965-calib.c b/trunk/drivers/net/wireless/iwlegacy/4965-calib.c
similarity index 100%
rename from trunk/drivers/net/wireless/iwlegacy/iwl-4965-calib.c
rename to trunk/drivers/net/wireless/iwlegacy/4965-calib.c
diff --git a/trunk/drivers/net/wireless/iwlegacy/iwl-4965-debugfs.c b/trunk/drivers/net/wireless/iwlegacy/4965-debug.c
similarity index 100%
rename from trunk/drivers/net/wireless/iwlegacy/iwl-4965-debugfs.c
rename to trunk/drivers/net/wireless/iwlegacy/4965-debug.c
diff --git a/trunk/drivers/net/wireless/iwlegacy/iwl-4965-rs.c b/trunk/drivers/net/wireless/iwlegacy/4965-rs.c
similarity index 100%
rename from trunk/drivers/net/wireless/iwlegacy/iwl-4965-rs.c
rename to trunk/drivers/net/wireless/iwlegacy/4965-rs.c
diff --git a/trunk/drivers/net/wireless/iwlegacy/Makefile b/trunk/drivers/net/wireless/iwlegacy/Makefile
index d0f9f23feea9..b0ffa98d179d 100644
--- a/trunk/drivers/net/wireless/iwlegacy/Makefile
+++ b/trunk/drivers/net/wireless/iwlegacy/Makefile
@@ -8,9 +8,8 @@ iwl-legacy-objs += $(iwl-legacy-m)
 
 # 4965
 obj-$(CONFIG_IWL4965)	+= iwl4965.o
-iwl4965-objs		:= 4965.o 4965-mac.o iwl-4965-rs.o
-iwl4965-objs		+= iwl-4965-calib.o
-iwl4965-$(CONFIG_IWLEGACY_DEBUGFS) += iwl-4965-debugfs.o
+iwl4965-objs		:= 4965.o 4965-mac.o 4965-rs.o 4965-calib.o
+iwl4965-$(CONFIG_IWLEGACY_DEBUGFS) += 4965-debug.o
 
 # 3945
 obj-$(CONFIG_IWL3945)	+= iwl3945.o