diff --git a/[refs] b/[refs]
index 1b07167d9ac2..c7d677f2a84c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 29d3dedf22bc8272186a7e0d8a8243d88606b569
+refs/heads/master: 0a8cff388a3841ec2e6c71d1f3c2535b24811c7d
diff --git a/trunk/arch/arm/mach-msm/Makefile b/trunk/arch/arm/mach-msm/Makefile
index 147339c87277..435d83cd52c2 100644
--- a/trunk/arch/arm/mach-msm/Makefile
+++ b/trunk/arch/arm/mach-msm/Makefile
@@ -1,5 +1,4 @@
 obj-y += io.o idle.o irq.o timer.o dma.o
-obj-y += devices.o
 obj-y += proc_comm.o
 obj-y += vreg.o
 obj-y += acpuclock-arm11.o
@@ -8,5 +7,5 @@ obj-y += clock.o clock-7x01a.o
 obj-$(CONFIG_MSM_SMD) += smd.o smd_debug.o
 obj-$(CONFIG_MSM_SMD) += last_radio_log.o
 
-obj-$(CONFIG_MACH_TROUT) += board-trout.o
-obj-$(CONFIG_MACH_HALIBUT) += board-halibut.o
+obj-$(CONFIG_MACH_TROUT) += board-trout.o devices-msm7x00.o
+obj-$(CONFIG_MACH_HALIBUT) += board-halibut.o devices-msm7x00.o
diff --git a/trunk/arch/arm/mach-msm/devices.c b/trunk/arch/arm/mach-msm/devices-msm7x00.c
similarity index 100%
rename from trunk/arch/arm/mach-msm/devices.c
rename to trunk/arch/arm/mach-msm/devices-msm7x00.c