Ignore:
Timestamp:
2015-11-02T20:54:19Z (10 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
d8513177
Parents:
3feeab2 (diff), 5265eea4 (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/drv/generic/private/driver.h

    r3feeab2 rff381a7  
    9696       
    9797        /** Connection handler or @c NULL to use the DDF default handler. */
    98         async_client_conn_t conn_handler;
     98        async_port_handler_t conn_handler;
    9999       
    100100        /** Link in the list of functions handled by the driver */
Note: See TracChangeset for help on using the changeset viewer.