Ignore:
Timestamp:
2009-11-03T21:36:54Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
1647323
Parents:
bbddafb (diff), b1c21c2 (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:
1 edited

Legend:

Unmodified
Added
Removed
  • contrib/arch/uspace/srv/fs/devfs/devfs.adl

    rbbddafb r4f5dc18  
    1313                devmap_client devmap_client;
    1414                service device;
     15        initialization:
     16                [/uspace/lib/libc/fnc.devmap_get_phone] ;
     17                !ns.ipc_m_connect_me_to /* vfs */ ;
     18                [/uspace/lib/libfs/fnc.fs_register]
    1519        protocol:
    16                 [/uspace/lib/libc/protocol] |
    17                 [devfs_server.bp]
     20                [/uspace/lib/libc/protocol]
    1821};
Note: See TracChangeset for help on using the changeset viewer.