diff --git a/[refs] b/[refs]
index a8654ed3d7fd..919f43b17932 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ee7dfb7e245e92c011c335e7bac2474967eda192
+refs/heads/master: e33cc5cec039ac6aef68568c06998707bceb0953
diff --git a/trunk/drivers/staging/Kconfig b/trunk/drivers/staging/Kconfig
index 9b396bdbeeb5..7696a664f8a5 100644
--- a/trunk/drivers/staging/Kconfig
+++ b/trunk/drivers/staging/Kconfig
@@ -109,7 +109,7 @@ source "drivers/staging/hv/Kconfig"
 
 source "drivers/staging/vme/Kconfig"
 
-source "drivers/staging/rar/Kconfig"
+source "drivers/staging/rar_register/Kconfig"
 
 source "drivers/staging/sep/Kconfig"
 
diff --git a/trunk/drivers/staging/Makefile b/trunk/drivers/staging/Makefile
index 95ef22081a4c..ea2e70e2fed4 100644
--- a/trunk/drivers/staging/Makefile
+++ b/trunk/drivers/staging/Makefile
@@ -35,7 +35,7 @@ obj-$(CONFIG_VT6656)		+= vt6656/
 obj-$(CONFIG_FB_UDL)		+= udlfb/
 obj-$(CONFIG_HYPERV)		+= hv/
 obj-$(CONFIG_VME_BUS)		+= vme/
-obj-$(CONFIG_RAR_REGISTER)	+= rar/
+obj-$(CONFIG_RAR_REGISTER)	+= rar_register/
 obj-$(CONFIG_DX_SEP)		+= sep/
 obj-$(CONFIG_IIO)		+= iio/
 obj-$(CONFIG_RAMZSWAP)		+= ramzswap/
diff --git a/trunk/drivers/staging/rar/Kconfig b/trunk/drivers/staging/rar_register/Kconfig
similarity index 100%
rename from trunk/drivers/staging/rar/Kconfig
rename to trunk/drivers/staging/rar_register/Kconfig
diff --git a/trunk/drivers/staging/rar/Makefile b/trunk/drivers/staging/rar_register/Makefile
similarity index 100%
rename from trunk/drivers/staging/rar/Makefile
rename to trunk/drivers/staging/rar_register/Makefile
diff --git a/trunk/drivers/staging/rar/rar_register.c b/trunk/drivers/staging/rar_register/rar_register.c
similarity index 100%
rename from trunk/drivers/staging/rar/rar_register.c
rename to trunk/drivers/staging/rar_register/rar_register.c
diff --git a/trunk/drivers/staging/rar/rar_register.h b/trunk/drivers/staging/rar_register/rar_register.h
similarity index 100%
rename from trunk/drivers/staging/rar/rar_register.h
rename to trunk/drivers/staging/rar_register/rar_register.h