Changeset e1a27be in mainline for kernel/arch/arm32/src/machine_func.c

Timestamp:

2012-12-29T10:48:35Z (11 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

17cc8f4f

Parents:

8f88beb (diff), c928bb7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• kernel/arch/arm32/src/machine_func.c (modified) (2 diffs)

kernel/arch/arm32/src/machine_func.c

@@ -41 +41 @@
 #include <arch/mach/gta02/gta02.h>
 #include <arch/mach/integratorcp/integratorcp.h>
-#include <arch/mach/testarm/testarm.h>
 #include <arch/mach/beagleboardxm/beagleboardxm.h>
 #include <arch/mach/beaglebone/beaglebone.h>
@@ -53 +52 @@
 #if defined(MACHINE_gta02)
         machine_ops = &gta02_machine_ops;
-#elif defined(MACHINE_testarm)
-        machine_ops = &gxemul_machine_ops;
 #elif defined(MACHINE_integratorcp)
         machine_ops = &icp_machine_ops;