Changeset e2ec667e in mainline for kernel/generic/src/lib/func.c

Timestamp:

2012-02-28T19:18:59Z (10 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

lfn, master

Children:

c0964cd7

Parents:

412f813 (diff), 68c60b0 (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 with mainline

File:

• kernel/generic/src/lib/func.c (modified) (1 diff)

kernel/generic/src/lib/func.c

@@ -53 +53 @@
 void halt()
 {
-#ifdef CONFIG_DEBUG
+#if (defined(CONFIG_DEBUG)) && (defined(CONFIG_KCONSOLE))
         bool rundebugger = false;