Changeset 25eec4e in mainline for kernel/arch/ppc32/src/ppc32.c

Timestamp:

2013-04-19T18:38:18Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6d717a4

Parents:

a1e2df13 (diff), 289cb7dd (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 chages.

File:

• kernel/arch/ppc32/src/ppc32.c (modified) (2 diffs)

kernel/arch/ppc32/src/ppc32.c

@@ -103 +103 @@
 }
 
+#ifdef CONFIG_FB
 static bool display_register(ofw_tree_node_t *node, void *arg)
 {
@@ -169 +170 @@
         return true;
 }
+#endif
 
 void arch_post_mm_init(void)