Changeset 969585f in mainline for uspace/app/init/init.c

Timestamp:

2011-04-01T20:49:28Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

0053fa38, 5542b83, c6ba274

Parents:

8e7d724 (diff), ebcb05a (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/init/init.c (modified) (2 diffs)

uspace/app/init/init.c

@@ -314 +314 @@
         getterm("term/vc6", "/app/klog", false);
 
+#ifdef CONFIG_START_DEVMAN
+
 #ifdef CONFIG_DEVMAN_EARLY_LAUNCH
         spawn("/srv/devman");
@@ -320 +322 @@
 #endif
 
+#endif
+
         return 0;
 }