Ignore:
Timestamp:
2011-08-19T09:00:38Z (13 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
e2ab36f1
Parents:
d894fbd (diff), 42a619b (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:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/ext2/libext2_superblock.h

    rd894fbd r903bac0a  
    110110extern uint32_t ext2_superblock_get_features_read_only(ext2_superblock_t *);
    111111
    112 extern int ext2_superblock_read_direct(devmap_handle_t, ext2_superblock_t **);
     112extern int ext2_superblock_read_direct(service_id_t, ext2_superblock_t **);
    113113extern int ext2_superblock_check_sanity(ext2_superblock_t *);
    114114
Note: See TracChangeset for help on using the changeset viewer.