Changeset db96017 in mainline for uspace/app/init/init.c

Timestamp:

2012-04-07T17:41:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

b6913b7

Parents:

b69e4c0 (diff), 6bb169b5 (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

@@ -302 +302 @@
         spawn("/srv/obio");
         srv_start("/srv/cuda_adb");
-        srv_start("/srv/i8042");
         srv_start("/srv/s3c24ser");
         srv_start("/srv/s3c24ts");
+        
+        spawn("/srv/net");
         
         spawn("/srv/fb");
@@ -311 +312 @@
         
         spawn("/srv/clip");
+        spawn("/srv/remcons");
         
         /*