Changeset 0773396 in mainline for uspace/lib/block/block.h


Ignore:
Timestamp:
2013-12-25T13:05:25Z (10 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
bc54126c
Parents:
f4a47e52 (diff), 6946f23 (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/block/block.h

    rf4a47e52 r0773396  
    2929 */
    3030
    31 /** @addtogroup libblock 
     31/** @addtogroup libblock
    3232 * @{
    33  */ 
     33 */
    3434/**
    3535 * @file
    … …  
    4141#include <stdint.h>
    4242#include <async.h>
    43 #include "../../srv/vfs/vfs.h"
    4443#include <fibril_synch.h>
    4544#include <adt/hash_table.h>
    4645#include <adt/list.h>
     46#include <loc.h>
    4747
    4848/*
    … …  
    5050 */
    5151
    52 /** 
     52/**
    5353 * This macro is a symbolic value for situations where no special flags are
    5454 * needed.
Note: See TracChangeset for help on using the changeset viewer.