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

Timestamp:

2010-10-19T20:55:53Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a93d79a

Parents:

1882525 (diff), a7a85d16 (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/mach/integratorcp/integratorcp.c (modified) (2 diffs)

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

@@ -64 +64 @@
         icp_frame_init,
         icp_output_init,
-        icp_input_init
+        icp_input_init,
+        icp_get_irq_count
 };
 
@@ -336 +337 @@
 }
 
+size_t icp_get_irq_count(void)
+{
+        return ICP_IRQ_COUNT;
+}
 
 /** @}