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/fat/fat.adl

    rbbddafb r4f5dc18  
    99        requires:
    1010                [/uspace/lib/libc/requires]
    11                 vfs vfs;
    1211                ns ns;
    1312                rd rd;
     13                vfs vfs;
     14                tmpfs tmpfs_nested;
     15                fat fat_nested;
     16                devfs devfs_nested;
     17        initialization:
     18                !ns.ipc_m_connect_me_to /* vfs */ ;
     19                [/uspace/lib/libfs/fnc.fs_register]
    1420        protocol:
    15                 [/uspace/lib/libc/protocol] |
    16                 [fat_server.bp]
     21                [/uspace/lib/libc/protocol]
    1722};
Note: See TracChangeset for help on using the changeset viewer.