Ignore:
Timestamp:
2011-09-09T18:22:33Z (13 years ago)
Author:
Maurizio Lombardi <m.lombardi85@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
40a2af3
Parents:
980671e7 (diff), 5da7199 (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/srv/hw/bus/cuda_adb/cuda_adb.h

    r980671e7 r3781092  
    3838
    3939#include <sys/types.h>
    40 #include <ipc/loc.h>
     40#include <async.h>
    4141#include <fibril_synch.h>
    4242
     
    105105typedef struct {
    106106        service_id_t service_id;
    107         int client_phone;
     107        async_sess_t *client_sess;
    108108} adb_dev_t;
    109109
Note: See TracChangeset for help on using the changeset viewer.