diff --git a/[refs] b/[refs]
index b743b0839f5a..a8654ed3d7fd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e37bcc0de040127281de13a84a608570355c20eb
+refs/heads/master: ee7dfb7e245e92c011c335e7bac2474967eda192
diff --git a/trunk/drivers/staging/rar/Makefile b/trunk/drivers/staging/rar/Makefile
index 5422ed04ccf1..d5954ccc16c9 100644
--- a/trunk/drivers/staging/rar/Makefile
+++ b/trunk/drivers/staging/rar/Makefile
@@ -1,2 +1,2 @@
 EXTRA_CFLAGS += -DLITTLE__ENDIAN
-obj-$(CONFIG_RAR_REGISTER) += rar_driver.o
+obj-$(CONFIG_RAR_REGISTER) += rar_register.o
diff --git a/trunk/drivers/staging/rar/rar_driver.c b/trunk/drivers/staging/rar/rar_register.c
similarity index 99%
rename from trunk/drivers/staging/rar/rar_driver.c
rename to trunk/drivers/staging/rar/rar_register.c
index a85a7da6df40..51eb5a360f1c 100644
--- a/trunk/drivers/staging/rar/rar_driver.c
+++ b/trunk/drivers/staging/rar/rar_register.c
@@ -15,7 +15,7 @@
 #include <linux/pci.h>
 #include <linux/firmware.h>
 #include <linux/sched.h>
-#include "rar_driver.h"
+#include "rar_register.h"
 
 /* The following defines are for the IPC process to retrieve RAR in */
 
diff --git a/trunk/drivers/staging/rar/rar_driver.h b/trunk/drivers/staging/rar/rar_register.h
similarity index 100%
rename from trunk/drivers/staging/rar/rar_driver.h
rename to trunk/drivers/staging/rar/rar_register.h