Ignore:
Timestamp:
2011-07-08T17:01:01Z (14 years ago)
Author:
Martin Sucha <sucha14@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
cc1a727
Parents:
4e36219 (diff), 026793d (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/net/include/adt/module_map.h

    r4e36219 rc028b22  
    3939
    4040#include <task.h>
    41 #include <ipc/services.h>
     41#include <async.h>
    4242#include <net/modules.h>
    4343#include <adt/generic_char_map.h>
     
    6060        /** Module service identifier. */
    6161        services_t service;
    62         /** Module phone if running and connected. */
    63         int phone;
     62        /** Module session if running and connected. */
     63        async_sess_t *sess;
    6464        /** Usage counter. */
    6565        int usage;
Note: See TracChangeset for help on using the changeset viewer.