Ignore:
Timestamp:
2011-11-06T22:21:05Z (15 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/fix-logger-deadlock, topic/msim-upgrade, topic/simplify-dev-export
Children:
898e847
Parents:
2bdf8313 (diff), 7b5f4c9 (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

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