diff --git a/[refs] b/[refs]
index 863ce4477736..b93dfaf2bfd3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 763eef8b5b64dbbfc0f6273af9a57024069785a9
+refs/heads/master: 11c8ea81cc639c2ea56f94a9cdaa6242ff13a3af
diff --git a/trunk/arch/arm/mach-ux500/Makefile b/trunk/arch/arm/mach-ux500/Makefile
index 3d2c6a510a87..12052e8e064c 100644
--- a/trunk/arch/arm/mach-ux500/Makefile
+++ b/trunk/arch/arm/mach-ux500/Makefile
@@ -12,6 +12,6 @@ obj-$(CONFIG_SMP)		+= platsmp.o headsmp.o
 obj-$(CONFIG_HOTPLUG_CPU)	+= hotplug.o
 obj-$(CONFIG_LOCAL_TIMERS)	+= localtimer.o
 obj-$(CONFIG_REGULATOR_AB8500)	+= board-mop500-regulators.o
-obj-$(CONFIG_U5500_MODEM_IRQ)	+= modem_irq.o
-obj-$(CONFIG_U5500_MBOX)	+= mbox.o
+obj-$(CONFIG_U5500_MODEM_IRQ)	+= modem-irq-db5500.o
+obj-$(CONFIG_U5500_MBOX)	+= mbox-db5500.o
 obj-$(CONFIG_CPU_FREQ)		+= cpufreq.o
diff --git a/trunk/arch/arm/mach-ux500/include/mach/mbox.h b/trunk/arch/arm/mach-ux500/include/mach/mbox-db5500.h
similarity index 100%
rename from trunk/arch/arm/mach-ux500/include/mach/mbox.h
rename to trunk/arch/arm/mach-ux500/include/mach/mbox-db5500.h
diff --git a/trunk/arch/arm/mach-ux500/mbox.c b/trunk/arch/arm/mach-ux500/mbox-db5500.c
similarity index 99%
rename from trunk/arch/arm/mach-ux500/mbox.c
rename to trunk/arch/arm/mach-ux500/mbox-db5500.c
index 63435389c544..cbf15718fc3c 100644
--- a/trunk/arch/arm/mach-ux500/mbox.c
+++ b/trunk/arch/arm/mach-ux500/mbox-db5500.c
@@ -38,7 +38,7 @@
 #include <linux/debugfs.h>
 #include <linux/seq_file.h>
 #include <linux/completion.h>
-#include <mach/mbox.h>
+#include <mach/mbox-db5500.h>
 
 #define MBOX_NAME "mbox"
 
diff --git a/trunk/arch/arm/mach-ux500/modem_irq.c b/trunk/arch/arm/mach-ux500/modem-irq-db5500.c
similarity index 100%
rename from trunk/arch/arm/mach-ux500/modem_irq.c
rename to trunk/arch/arm/mach-ux500/modem-irq-db5500.c
diff --git a/trunk/drivers/net/caif/caif_shm_u5500.c b/trunk/drivers/net/caif/caif_shm_u5500.c
index 1cd90da86f13..13fa5353816e 100644
--- a/trunk/drivers/net/caif/caif_shm_u5500.c
+++ b/trunk/drivers/net/caif/caif_shm_u5500.c
@@ -11,7 +11,7 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/netdevice.h>
-#include <mach/mbox.h>
+#include <mach/mbox-db5500.h>
 #include <net/caif/caif_shm.h>
 
 MODULE_LICENSE("GPL");