diff --git a/[refs] b/[refs]
index 7805989d0f14..1befd6556997 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f3a1b49d669472159e05327fff64ec55315a0f54
+refs/heads/master: ccf5533ec4cdf792ec17c375b1186cfed4086f2a
diff --git a/trunk/drivers/net/wireless/iwlegacy/iwl-3945-debugfs.c b/trunk/drivers/net/wireless/iwlegacy/3945-debug.c
similarity index 100%
rename from trunk/drivers/net/wireless/iwlegacy/iwl-3945-debugfs.c
rename to trunk/drivers/net/wireless/iwlegacy/3945-debug.c
diff --git a/trunk/drivers/net/wireless/iwlegacy/iwl-3945-rs.c b/trunk/drivers/net/wireless/iwlegacy/3945-rs.c
similarity index 100%
rename from trunk/drivers/net/wireless/iwlegacy/iwl-3945-rs.c
rename to trunk/drivers/net/wireless/iwlegacy/3945-rs.c
diff --git a/trunk/drivers/net/wireless/iwlegacy/Makefile b/trunk/drivers/net/wireless/iwlegacy/Makefile
index b0ffa98d179d..d402496759e4 100644
--- a/trunk/drivers/net/wireless/iwlegacy/Makefile
+++ b/trunk/drivers/net/wireless/iwlegacy/Makefile
@@ -13,7 +13,7 @@ iwl4965-$(CONFIG_IWLEGACY_DEBUGFS) += 4965-debug.o
 
 # 3945
 obj-$(CONFIG_IWL3945)	+= iwl3945.o
-iwl3945-objs		:= 3945-mac.o 3945.o iwl-3945-rs.o
-iwl3945-$(CONFIG_IWLEGACY_DEBUGFS) += iwl-3945-debugfs.o
+iwl3945-objs		:= 3945-mac.o 3945.o 3945-rs.o
+iwl3945-$(CONFIG_IWLEGACY_DEBUGFS) += 3945-debug.o
 
 ccflags-y += -D__CHECK_ENDIAN__