Ignore:
Timestamp:
2011-11-18T15:32:24Z (13 years ago)
Author:
Frantisek Princ <frantisek.princ@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
528e5b3
Parents:
b12ca16 (diff), 0c0f823b (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 with mainline

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/infrastructure/rootpc/rootpc.c

    rb12ca16 rd5ba17f  
    6363} rootpc_fun_t;
    6464
    65 static int rootpc_add_device(ddf_dev_t *dev);
     65static int rootpc_dev_add(ddf_dev_t *dev);
    6666static void root_pc_init(void);
    6767
    6868/** The root device driver's standard operations. */
    6969static driver_ops_t rootpc_ops = {
    70         .add_device = &rootpc_add_device
     70        .dev_add = &rootpc_dev_add
    7171};
    7272
     
    175175 * @return              Zero on success, negative error number otherwise.
    176176 */
    177 static int rootpc_add_device(ddf_dev_t *dev)
    178 {
    179         ddf_msg(LVL_DEBUG, "rootpc_add_device, device handle = %d",
     177static int rootpc_dev_add(ddf_dev_t *dev)
     178{
     179        ddf_msg(LVL_DEBUG, "rootpc_dev_add, device handle = %d",
    180180            (int)dev->handle);
    181181       
Note: See TracChangeset for help on using the changeset viewer.