Changeset 6773ff3 in mainline for uspace/app/init/init.c

Timestamp:

2012-04-23T14:57:42Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

ee3b6150

Parents:

728d771 (diff), 6aae539d (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:

• uspace/app/init/init.c (modified) (1 diff)

uspace/app/init/init.c

@@ -302 +302 @@
         spawn("/srv/obio");
         srv_start("/srv/cuda_adb");
-        srv_start("/srv/s3c24ser");
-        srv_start("/srv/s3c24ts");
+        srv_start("/srv/s3c24xx_uart");
+        srv_start("/srv/s3c24xx_ts");
         
         spawn("/srv/loopip");