diff --git a/[refs] b/[refs]
index 0b21fa739582..db62a3f25d2b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 65f97a56944b797f5df714d677b541cca0829669
+refs/heads/master: 248285501ea251379dd449316bf5af78362ae638
diff --git a/trunk/drivers/ps3/Makefile b/trunk/drivers/ps3/Makefile
index 746031de2195..1f5a2d33bf5b 100644
--- a/trunk/drivers/ps3/Makefile
+++ b/trunk/drivers/ps3/Makefile
@@ -1,6 +1,6 @@
-obj-$(CONFIG_PS3_VUART) += vuart.o
+obj-$(CONFIG_PS3_VUART) += ps3-vuart.o
 obj-$(CONFIG_PS3_PS3AV) += ps3av_mod.o
 ps3av_mod-objs		+= ps3av.o ps3av_cmd.o
 obj-$(CONFIG_PPC_PS3) += sys-manager-core.o
-obj-$(CONFIG_PS3_SYS_MANAGER) += sys-manager.o
+obj-$(CONFIG_PS3_SYS_MANAGER) += ps3-sys-manager.o
 obj-$(CONFIG_PS3_STORAGE) += ps3stor_lib.o
diff --git a/trunk/drivers/ps3/sys-manager.c b/trunk/drivers/ps3/ps3-sys-manager.c
similarity index 100%
rename from trunk/drivers/ps3/sys-manager.c
rename to trunk/drivers/ps3/ps3-sys-manager.c
diff --git a/trunk/drivers/ps3/vuart.c b/trunk/drivers/ps3/ps3-vuart.c
similarity index 100%
rename from trunk/drivers/ps3/vuart.c
rename to trunk/drivers/ps3/ps3-vuart.c