Changeset f1fae414 in mainline for uspace/app/trace/trace.c

Timestamp:

2011-06-22T01:34:53Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

8d7e82c1, cac458f

Parents:

72ec8cc (diff), bf172825 (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:

• uspace/app/trace/trace.c (modified) (2 diffs)

uspace/app/trace/trace.c

@@ -792 +792 @@
         proto_register(SERVICE_VFS, p);
 
+#if 0
         p = proto_new("console");
 
@@ -827 +828 @@
         proto_console = p;
         proto_register(SERVICE_CONSOLE, p);
+#endif
 }