Changeset 41811af in mainline for uspace/lib/drv/include/ddf/driver.h


Ignore:
Timestamp:
2011-06-10T10:14:26Z (14 years ago)
Author:
Jiří Zárevúcky <zarevucky.jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
ab547063
Parents:
9536e6e (diff), 390d80d (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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/drv/include/ddf/driver.h

    r9536e6e r41811af  
    3737#define DDF_DRIVER_H_
    3838
     39#include <async.h>
    3940#include <ipc/devman.h>
    4041#include <ipc/dev_iface.h>
    41 
    4242#include "../dev_iface.h"
    4343
     
    8383       
    8484        /**
    85          * Phone to the parent device driver (if it is different from this
     85         * Session to the parent device driver (if it is different from this
    8686         * driver)
    8787         */
    88         int parent_phone;
     88        async_sess_t *parent_sess;
    8989       
    9090        /** Device name */
Note: See TracChangeset for help on using the changeset viewer.