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

Timestamp:

2013-07-24T17:42:25Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

69b264a9

Parents:

52f1882 (diff), cffa14e6 (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.

usb hc macro changes from mainline were reverted, too many conflicts

File:

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

uspace/app/init/init.c

@@ -359 +359 @@
         srv_start("/srv/tcp");
         srv_start("/srv/udp");
+        srv_start("/srv/dnsrsrv");
         
         srv_start("/srv/clipboard");
@@ -369 +370 @@
 #ifdef CONFIG_START_BD
         srv_start("/srv/ata_bd");
-        srv_start("/srv/gxe_bd");
 #endif