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

Timestamp:

2014-03-15T19:21:53Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

c773adc

Parents:

2034f98 (diff), 8cffdf5 (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

@@ -43 +43 @@
 #include <arch/mach/beagleboardxm/beagleboardxm.h>
 #include <arch/mach/beaglebone/beaglebone.h>
+#include <arch/mach/raspberrypi/raspberrypi.h>
 
 /** Pointer to machine_ops structure being used. */
@@ -58 +59 @@
 #elif defined(MACHINE_beaglebone)
         machine_ops = &bbone_machine_ops;
+#elif defined(MACHINE_raspberrypi)
+        machine_ops = &raspberrypi_machine_ops;
 #else
 #error Machine type not defined.