Changeset 985e26d2 in mainline for uspace/lib/libblock/libblock.c


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/libblock/libblock.c

    r743e17b r985e26d2  
    4747#include <as.h>
    4848#include <assert.h>
    49 #include <fibril_sync.h>
     49#include <fibril_synch.h>
    5050#include <adt/list.h>
    5151#include <adt/hash_table.h>
     
    168168        }
    169169
    170         rc = ipc_share_out_start(dev_phone, comm_area,
     170        rc = async_share_out_start(dev_phone, comm_area,
    171171            AS_AREA_READ | AS_AREA_WRITE);
    172172        if (rc != EOK) {
Note: See TracChangeset for help on using the changeset viewer.