Changeset 985e26d2 in mainline for contrib/arch/uspace/srv/ns/ns.bp

Timestamp:

2010-01-07T19:06:59Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

8190e63

Parents:

743e17b (diff), eca2435 (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:

• contrib/arch/uspace/srv/ns/ns.bp (moved) (moved from contrib/arch/uspace/srv/ns/naming_service.bp ) (1 diff)

contrib/arch/uspace/srv/ns/ns.bp

@@ -11 +11 @@
         ?ipc_m_connect_me_to {
                 tentative {
-                        !service.ipc_m_connect_me_to /* forward */
+                        alternative (service; kbd; fb; console; vfs; devmap_driver; devmap_client) {
+                                !service.ipc_m_connect_me_to /* forward */
+                        }
                 }
         } +