Changeset a465a56 in mainline for kernel/arch/arm32/src/mach/integratorcp/integratorcp.c

Timestamp:

2010-12-25T15:18:58Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

f8b00f1

Parents:

700af62 (diff), 467bf40 (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 development/ changes

No conflicts.

File:

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

kernel/arch/arm32/src/mach/integratorcp/integratorcp.c

@@ -65 +65 @@
         icp_output_init,
         icp_input_init,
-        icp_get_irq_count
+        icp_get_irq_count,
+        icp_get_platform_name
 };
 
@@ -342 +343 @@
 }
 
+const char *icp_get_platform_name(void)
+{
+        return "integratorcp";
+}
+
 /** @}
  */