Index: kernel/arch/arm32/src/mach/integratorcp/integratorcp.c
===================================================================
--- kernel/arch/arm32/src/mach/integratorcp/integratorcp.c	(revision 214ec25cbbfd86e547613a9d32809cef432e810d)
+++ kernel/arch/arm32/src/mach/integratorcp/integratorcp.c	(revision 0a447abfa2fbd2b5dd35e01f0c0fdd594022ccea)
@@ -56,5 +56,5 @@
 static icp_hw_map_t icp_hw_map;
 static irq_t icp_timer_irq;
-struct arm_machine_ops machine_ops = {
+struct arm_machine_ops icp_machine_ops = {
 	icp_init,
 	icp_timer_irq_start,
Index: kernel/arch/arm32/src/mach/testarm/testarm.c
===================================================================
--- kernel/arch/arm32/src/mach/testarm/testarm.c	(revision 214ec25cbbfd86e547613a9d32809cef432e810d)
+++ kernel/arch/arm32/src/mach/testarm/testarm.c	(revision 0a447abfa2fbd2b5dd35e01f0c0fdd594022ccea)
@@ -56,5 +56,5 @@
 static irq_t gxemul_timer_irq;
 
-struct arm_machine_ops machine_ops = {
+struct arm_machine_ops gxemul_machine_ops = {
 	gxemul_init,
 	gxemul_timer_irq_start,