Changeset 467bf40 in mainline for kernel/arch/arm32/include/mach/integratorcp/integratorcp.h

Timestamp:

2010-12-25T15:13:07Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a465a56, e84d65a

Parents:

ab49a0d (diff), 6eb794a (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

Conflicts: no problem resolving.

File:

• kernel/arch/arm32/include/mach/integratorcp/integratorcp.h (modified) (1 diff)

kernel/arch/arm32/include/mach/integratorcp/integratorcp.h

@@ -106 +106 @@
 extern void icp_frame_init(void);
 extern size_t icp_get_irq_count(void);
+extern const char *icp_get_platform_name(void);
 
 extern struct arm_machine_ops icp_machine_ops;