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

Timestamp:

2010-12-23T23:28:08Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

3ac66f69, 467bf40

Parents:

8240dc5a (diff), a3eeef45 (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 sysinfo platform driver selection and sysinfo command.

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";
+}
+
 /** @}
  */