Changeset f1fae414 in mainline for uspace/app/init/init.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/init/init.c (modified) (1 diff)

uspace/app/init/init.c

@@ -275 +275 @@
         srv_start("/srv/i8042");
         srv_start("/srv/s3c24ser");
-        srv_start("/srv/adb_ms");
-        srv_start("/srv/char_ms");
         srv_start("/srv/s3c24ts");
         
         spawn("/srv/fb");
-        spawn("/srv/kbd");
-        console("hid_in/kbd");
+        spawn("/srv/input");
+        console("hid/input");
         
         spawn("/srv/clip");