diff --git a/[refs] b/[refs]
index ef5caa7d4007..564014e62626 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 817412d3a1391d4667494f16cd49455c62453c78
+refs/heads/master: cb165c52561fd5947747fdbdb0c7ad22c6138175
diff --git a/trunk/arch/arm/mach-ux500/Makefile b/trunk/arch/arm/mach-ux500/Makefile
index 55651e04ab43..2eb768583e21 100644
--- a/trunk/arch/arm/mach-ux500/Makefile
+++ b/trunk/arch/arm/mach-ux500/Makefile
@@ -3,6 +3,6 @@
 #
 
 obj-y				:= clock.o cpu.o devices.o
-obj-$(CONFIG_ARCH_U8500)	+= cpu-u8500.o devices-db8500.o
+obj-$(CONFIG_UX500_SOC_DB8500)	+= cpu-db8500.o devices-db8500.o
 obj-$(CONFIG_MACH_U8500_MOP)	+= board-mop500.o
 obj-$(CONFIG_SMP)		+= platsmp.o headsmp.o localtimer.o
diff --git a/trunk/arch/arm/mach-ux500/cpu-u8500.c b/trunk/arch/arm/mach-ux500/cpu-db8500.c
similarity index 100%
rename from trunk/arch/arm/mach-ux500/cpu-u8500.c
rename to trunk/arch/arm/mach-ux500/cpu-db8500.c